From c336c328e72081c7c3143288289a2255002d5321 Mon Sep 17 00:00:00 2001 From: David Rose Date: Thu, 12 Oct 2000 22:33:43 +0000 Subject: [PATCH] *** empty log message *** --- panda/src/wdxdisplay/wdxGraphicsWindow.cxx | 5 +++-- panda/src/wgldisplay/wglGraphicsWindow.cxx | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/panda/src/wdxdisplay/wdxGraphicsWindow.cxx b/panda/src/wdxdisplay/wdxGraphicsWindow.cxx index 0f2af4d7af..0dc3b95a83 100644 --- a/panda/src/wdxdisplay/wdxGraphicsWindow.cxx +++ b/panda/src/wdxdisplay/wdxGraphicsWindow.cxx @@ -1077,12 +1077,13 @@ void wdxGraphicsWindow::config(void) { RECT win_rect; SetRect(&win_rect, _props._xorg, _props._yorg, _props._xorg + _props._xsize, _props._yorg + _props._ysize); + HWND desktop = GetDesktopWindow(); // rect now contains the coords for the entire window, not the client if (dx_full_screen) { _mwindow = CreateWindow("wdxDisplay", _props._title.c_str(), WS_POPUP, 0, 0, _props._xsize,_props._ysize, - NULL, NULL, hinstance, 0); + desktop, NULL, hinstance, 0); } else { if (_props._border) style = WS_OVERLAPPEDWINDOW; @@ -1098,7 +1099,7 @@ void wdxGraphicsWindow::config(void) { _mwindow = CreateWindow("wdxDisplay", _props._title.c_str(), style, win_rect.left, win_rect.top, win_rect.right-win_rect.left, win_rect.bottom-win_rect.top, - NULL, NULL, hinstance, 0); + desktop, NULL, hinstance, 0); } if (!_mwindow) { diff --git a/panda/src/wgldisplay/wglGraphicsWindow.cxx b/panda/src/wgldisplay/wglGraphicsWindow.cxx index 4bbb35d25a..9e5b4796aa 100644 --- a/panda/src/wgldisplay/wglGraphicsWindow.cxx +++ b/panda/src/wgldisplay/wglGraphicsWindow.cxx @@ -504,6 +504,7 @@ void wglGraphicsWindow::config(void) { wglGraphicsPipe* pipe = DCAST(wglGraphicsPipe, _pipe); HINSTANCE hinstance = GetModuleHandle(NULL); + HWND desktop = GetDesktopWindow(); if (_props._fullscreen) { _props._xorg = 0; @@ -513,7 +514,7 @@ void wglGraphicsWindow::config(void) { _mwindow = CreateWindow("wglFullscreen", _props._title.c_str(), WS_POPUP | WS_MAXIMIZE, _props._xorg, _props._yorg, _props._xsize, _props._ysize, - NULL, NULL, hinstance, 0); + desktop, NULL, hinstance, 0); } else { int xorg = _props._xorg; @@ -529,7 +530,7 @@ void wglGraphicsWindow::config(void) { _mwindow = CreateWindow("wglStandard", _props._title.c_str(), style, xorg, yorg, xsize, ysize, - NULL, NULL, hinstance, 0); + desktop, NULL, hinstance, 0); } if (!_mwindow) {