From 4fd0e1b06b0d2c8a3cd5efff652344fa6a0a4890 Mon Sep 17 00:00:00 2001
From: cxgeorge <>
Date: Tue, 17 Jul 2001 01:32:25 +0000
Subject: [PATCH] trivial chngs

---
 panda/src/wgldisplay/wglGraphicsPipe.cxx   |  4 ---
 panda/src/wgldisplay/wglGraphicsWindow.cxx | 39 +---------------------
 2 files changed, 1 insertion(+), 42 deletions(-)

diff --git a/panda/src/wgldisplay/wglGraphicsPipe.cxx b/panda/src/wgldisplay/wglGraphicsPipe.cxx
index b656d13a25..20e0964ef0 100644
--- a/panda/src/wgldisplay/wglGraphicsPipe.cxx
+++ b/panda/src/wgldisplay/wglGraphicsPipe.cxx
@@ -17,16 +17,12 @@
 ////////////////////////////////////////////////////////////////////
 #include "wglGraphicsPipe.h"
 #include "config_wgldisplay.h"
-#include <mouseButton.h>
-#include <keyboardButton.h>
 
 ////////////////////////////////////////////////////////////////////
 // Static variables
 ////////////////////////////////////////////////////////////////////
 TypeHandle wglGraphicsPipe::_type_handle;
 
-//wglGraphicsPipe *global_pipe;
-
 wglGraphicsPipe::wglGraphicsPipe(const PipeSpecifier& spec)
   : InteractiveGraphicsPipe(spec)
 {}
diff --git a/panda/src/wgldisplay/wglGraphicsWindow.cxx b/panda/src/wgldisplay/wglGraphicsWindow.cxx
index 43ed0e2ef9..30328270e3 100644
--- a/panda/src/wgldisplay/wglGraphicsWindow.cxx
+++ b/panda/src/wgldisplay/wglGraphicsWindow.cxx
@@ -113,8 +113,6 @@ void wglGraphicsWindow::DestroyMe(bool bAtExit) {
       // revert to default display mode
       ChangeDisplaySettings(NULL,0x0);
   }
-  
-  global_wglwinptr=NULL;  //should be safe to do this now, since anyone who needs it at CreateWin will just set it during creation
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -425,6 +423,7 @@ void wglGraphicsWindow::config(void) {
   }
     
   hwnd_pandawin_map[_mwindow] = this;
+  global_wglwinptr = NULL;  // get rid of any reference to this obj
     
   // move window to top of zorder
   SetWindowPos(_mwindow, HWND_TOP, 0,0,0,0, SWP_NOMOVE | SWP_NOSENDCHANGING | SWP_NOSIZE);
@@ -870,42 +869,6 @@ int wglGraphicsWindow::choose_visual(void) {
   return i;
 }
 
-#if 0
-////////////////////////////////////////////////////////////////////
-//     Function: adjust_coords
-//       Access:
-//  Description: Adjust the window rectangle because Win32 thinks
-//       that the x, y, width, and height are the *entire*
-//       window, including decorations, whereas we assume
-//       the size is the *client* area of the window.
-////////////////////////////////////////////////////////////////////
-void wglGraphicsWindow::
-adjust_coords(int &xorg, int &yorg, int &xsize, int &ysize) {
-  RECT rect;
-  rect.left = xorg;  rect.top = yorg;
-  rect.right = xorg + xsize;
-  rect.bottom = yorg + ysize;
-
-  // Style determines whether there are borders or not
-  // False in third parameter indicates window has no menu bar
-  AdjustWindowRect(&rect, WS_CLIPSIBLINGS | WS_CLIPCHILDREN |
-              WS_OVERLAPPEDWINDOW, false);
-
-  // Readjust if the x and y are offscreen
-  if (rect.left < 0)
-    xorg = 0;
-  else
-    xorg = rect.left;
-
-  if (rect.top < 0)
-    yorg = 0;
-  else
-    yorg = rect.top;
-
-  xsize = rect.right - rect.left;
-  ysize = rect.bottom - rect.top;
-}
-#endif
 ////////////////////////////////////////////////////////////////////
 //     Function: setup_colormap
 //       Access: