Splitting platform-specific code out of "fgJoystickClose" function

[freeglut] / src / mswin / freeglut_state_mswin.c

diff --git a/src/mswin/freeglut_state_mswin.c b/src/mswin/freeglut_state_mswin.c
index 764259c..1f9966b 100644 (file)
--- a/src/mswin/freeglut_state_mswin.c
+++ b/src/mswin/freeglut_state_mswin.c
@@ -26,9 +26,20 @@
  */\r
 \r
 #include <GL/freeglut.h>\r
-#include "freeglut_internal_mswin.h"\r
+#include "../Common/freeglut_internal.h"\r
 \r
 \r
+extern GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,\r
+                                     unsigned char layer_type );\r
+\r
+/* \r
+ * Helper functions for getting client area from the window rect\r
+ * and the window rect from the client area given the style of the window\r
+ * (or a valid window pointer from which the style can be queried).\r
+ */\r
+extern RECT fghGetClientArea( const SFG_Window *window, BOOL wantPosOutside );\r
+extern void fghGetBorderWidth(const DWORD windowStyle, int* xBorderWidth, int* yBorderWidth);\r
+\r
 \r
 /* The following include file is available from SGI but is not standard:\r
  *   #include <GL/wglext.h>\r
@@ -218,7 +229,7 @@ int fgPlatformGlutGet ( GLenum eWhat )
     case GLUT_WINDOW_FORMAT_ID:\r
 #if !defined(_WIN32_WCE)\r
         if( fgStructure.CurrentWindow != NULL )\r
-            return GetPixelFormat( fgStructure.CurrentWindow->Window.Device );\r
+            return GetPixelFormat( fgStructure.CurrentWindow->Window.pContext.Device );\r
 #endif /* defined(_WIN32_WCE) */\r
         return 0;\r
 \r