This commit is contained in:
cxgeorge 2002-03-08 03:42:43 +00:00
parent 6acf279b98
commit 7b38b1e5e7

View File

@ -608,11 +608,11 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
break; break;
case WM_DISPLAYCHANGE: { case WM_DISPLAYCHANGE: {
#ifdef _DEBUG #ifdef _DEBUG
width = LOWORD(lparam); height = HIWORD(lparam); width = LOWORD(lparam); height = HIWORD(lparam);
DWORD newbitdepth=wparam; DWORD newbitdepth=wparam;
wdxdisplay_cat.spam() <<"WM_DISPLAYCHANGE received with width:" << width << " height: " << height << " bpp: " << wparam<< endl; wdxdisplay_cat.spam() <<"WM_DISPLAYCHANGE received with width:" << width << " height: " << height << " bpp: " << wparam<< endl;
#endif #endif
// unfortunately this doesnt seem to work because RestoreAllSurfaces doesn't // unfortunately this doesnt seem to work because RestoreAllSurfaces doesn't
// seem to think we're back in the original displaymode even after I've received // seem to think we're back in the original displaymode even after I've received
@ -631,8 +631,7 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
break; break;
case WM_SIZE: { case WM_SIZE: {
#ifdef _DEBUG
#ifdef _DEBUG
{ {
width = LOWORD(lparam); height = HIWORD(lparam); width = LOWORD(lparam); height = HIWORD(lparam);
wdxdisplay_cat.spam() << "WM_SIZE received with width:" << width << " height: " << height << " flags: " << wdxdisplay_cat.spam() << "WM_SIZE received with width:" << width << " height: " << height << " flags: " <<
@ -640,7 +639,7 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
((wparam == SIZE_MINIMIZED)? "SIZE_MINIMIZED " : "") << ((wparam == SIZE_RESTORED)? "SIZE_RESTORED " : "") << ((wparam == SIZE_MINIMIZED)? "SIZE_MINIMIZED " : "") << ((wparam == SIZE_RESTORED)? "SIZE_RESTORED " : "") <<
((wparam == SIZE_MAXIMIZED)? "SIZE_MAXIMIZED " : "") << endl; ((wparam == SIZE_MAXIMIZED)? "SIZE_MAXIMIZED " : "") << endl;
} }
#endif #endif
// old comment -- added SIZE_RESTORED to handle 3dfx case // old comment -- added SIZE_RESTORED to handle 3dfx case
if(dx_full_screen || ((_dxgsg==NULL) || (_dxgsg->scrn.hWnd==NULL)) || ((wparam != SIZE_RESTORED) && (wparam != SIZE_MAXIMIZED))) if(dx_full_screen || ((_dxgsg==NULL) || (_dxgsg->scrn.hWnd==NULL)) || ((wparam != SIZE_RESTORED) && (wparam != SIZE_MAXIMIZED)))
break; break;
@ -1049,10 +1048,6 @@ void wdxGraphicsWindowGroup::CreateWindows(void) {
assert(hUser32); assert(hUser32);
_pfnGetMonitorInfo = (PFN_GETMONITORINFO) GetProcAddress(hUser32, "GetMonitorInfoA"); _pfnGetMonitorInfo = (PFN_GETMONITORINFO) GetProcAddress(hUser32, "GetMonitorInfoA");
// Note: could use _TrackMouseEvent in comctrl32.dll (part of IE 3.0+) which emulates
// TrackMouseEvent on w95, but that requires another 500K of memory to hold that DLL,
// which is lame just to support w95, which probably has other issues anyway
_pfnTrackMouseEvent = (PFN_TRACKMOUSEEVENT) GetProcAddress(hUser32, "TrackMouseEvent"); _pfnTrackMouseEvent = (PFN_TRACKMOUSEEVENT) GetProcAddress(hUser32, "TrackMouseEvent");
FreeLibrary(hUser32); FreeLibrary(hUser32);