TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-05 03:15:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix comp warnings

Browse Source
This commit is contained in:
cxgeorge 2002-02-01 02:31:09 +00:00
parent 704e907451
commit 2018276a05
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
panda/src/wdxdisplay/wdxGraphicsWindow.cxx
View File

@ -921,7 +921,7 @@ void wdxGraphicsWindowGroup::CreateWindows(void) {
bool bSupportsColorCursor=true; bool bSupportsColorCursor=true;
/* if any card doesnt support color, dont load it*/ /* if any card doesnt support color, dont load it*/
for(int w=0;w<_windows.size();w++) for(DWORD w=0;w<_windows.size();w++)
bSupportsColorCursor &= supports_color_cursors(_windows[w]->_dxgsg->scrn.DXDeviceID); bSupportsColorCursor &= supports_color_cursors(_windows[w]->_dxgsg->scrn.DXDeviceID);
if(bSupportsColorCursor) { if(bSupportsColorCursor) {
@ -1009,7 +1009,7 @@ void wdxGraphicsWindowGroup::CreateWindows(void) {
// extra windows must be parented to the first so app doesnt minimize when user selects them // extra windows must be parented to the first so app doesnt minimize when user selects them
for(int devnum=0;devnum<_windows.size();devnum++) { for(DWORD devnum=0;devnum<_windows.size();devnum++) {
MONITORINFO minfo; MONITORINFO minfo;
ZeroMemory(&minfo, sizeof(MONITORINFO)); ZeroMemory(&minfo, sizeof(MONITORINFO));
minfo.cbSize = sizeof(MONITORINFO); minfo.cbSize = sizeof(MONITORINFO);
@ -1075,7 +1075,7 @@ void wdxGraphicsWindowGroup::CreateWindows(void) {
exit(1); exit(1);
} }
for(int devnum=0;devnum<_windows.size();devnum++) { for(DWORD devnum=0;devnum<_windows.size();devnum++) {
wdxGraphicsWindow *pWDXWin = _windows[devnum]; wdxGraphicsWindow *pWDXWin = _windows[devnum];
// for use by the window_proc // for use by the window_proc
hwnd_pandawin_map[pWDXWin->_dxgsg->scrn.hWnd] = pWDXWin; hwnd_pandawin_map[pWDXWin->_dxgsg->scrn.hWnd] = pWDXWin;
@ -1723,7 +1723,7 @@ SetCoopLevelsAndDisplayModes(void) {
SCL_FLAGS |= DDSCL_SETDEVICEWINDOW; SCL_FLAGS |= DDSCL_SETDEVICEWINDOW;
} }
for(int devnum=0;devnum<_windows.size();devnum++) { for(DWORD devnum=0;devnum<_windows.size();devnum++) {
DXScreenData *pScrn=&_windows[devnum]->_dxgsg->scrn; DXScreenData *pScrn=&_windows[devnum]->_dxgsg->scrn;
// need to set focus/device windows for multimon // need to set focus/device windows for multimon
@ -2714,13 +2714,13 @@ wdxGraphicsWindowGroup::wdxGraphicsWindowGroup(wdxGraphicsWindow *OneWindow) {
void wdxGraphicsWindowGroup::initWindowGroup(void) { void wdxGraphicsWindowGroup::initWindowGroup(void) {
HRESULT hr; HRESULT hr;
int i; unsigned int i;
assert(_windows.size()>0); assert(_windows.size()>0);
_hOldForegroundWindow=GetForegroundWindow(); _hOldForegroundWindow=GetForegroundWindow();
_bClosingAllWindows= false; _bClosingAllWindows= false;
int num_windows=_windows.size(); unsigned int num_windows=_windows.size();
#define DDRAW_NAME "ddraw.dll" #define DDRAW_NAME "ddraw.dll"
@ -2735,7 +2735,7 @@ void wdxGraphicsWindowGroup::initWindowGroup(void) {
// can only get multimon HW acceleration in fullscrn on DX7 // can only get multimon HW acceleration in fullscrn on DX7
int numMonitors = GetSystemMetrics(SM_CMONITORS); unsigned int numMonitors = GetSystemMetrics(SM_CMONITORS);
if(numMonitors < num_windows) { if(numMonitors < num_windows) {
if(numMonitors==0) { if(numMonitors==0) {
@ -2779,13 +2779,13 @@ void wdxGraphicsWindowGroup::initWindowGroup(void) {
_windows[i]->config_window(this); _windows[i]->config_window(this);
} }
int good_device_count=0; DWORD good_device_count=0;
if(num_windows==1) { if(num_windows==1) {
if(_windows[0]->search_for_device(0,NULL)) if(_windows[0]->search_for_device(0,NULL))
good_device_count=1; good_device_count=1;
} else { } else {
for(int devnum=0;devnum<_DeviceInfoVec.size() && (good_device_count < num_windows);devnum++) { for(DWORD devnum=0;devnum<_DeviceInfoVec.size() && (good_device_count < num_windows);devnum++) {
if(_windows[devnum]->search_for_device(devnum,&(_DeviceInfoVec[devnum]))) if(_windows[devnum]->search_for_device(devnum,&(_DeviceInfoVec[devnum])))
good_device_count++; good_device_count++;
} }
@ -2851,7 +2851,7 @@ wdxGraphicsWindowGroup::~wdxGraphicsWindowGroup() {
// this fn must be called before windows are actually closed // this fn must be called before windows are actually closed
_bClosingAllWindows= true; _bClosingAllWindows= true;
for(int i=0;i<_windows.size();i++) { for(DWORD i=0;i<_windows.size();i++) {
_windows[i]->close_window(); _windows[i]->close_window();
} }