Removing some Windows-specific function prototypes from "freeglut_internal.h"

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1008 7f0cb862-5218-0410-a997-914c9d46530a

diff --git a/src/Common/freeglut_internal.h b/src/Common/freeglut_internal.h
index cb527ff..f0f9d57 100644 (file)
--- a/src/Common/freeglut_internal.h
+++ b/src/Common/freeglut_internal.h
@@ -918,19 +918,6 @@ void fgEnumWindows( FGCBenumerator enumCallback, SFG_Enumerator* enumerator );
 void fgEnumSubWindows( SFG_Window* window, FGCBenumerator enumCallback,\r
                        SFG_Enumerator* enumerator );\r
 \r
-#if TARGET_HOST_MS_WINDOWS\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
-void fghComputeWindowRectFromClientArea_UseStyle   ( const DWORD windowStyle , RECT *clientRect, BOOL posIsOutside );\r
-void fghComputeWindowRectFromClientArea_QueryWindow( const SFG_Window *window, RECT *clientRect, BOOL posIsOutside );\r
-void fghComputeClientAreaFromWindowRect            ( const SFG_Window *window, RECT *windowRect, BOOL wantPosOutside );\r
-RECT fghGetClientArea                              ( const SFG_Window *window,                   BOOL wantPosOutside );\r
-void fghGetBorderWidth(const DWORD windowStyle, int* xBorderWidth, int* yBorderWidth);\r
-#endif\r
-\r
 /*\r
  * fgWindowByHandle returns a (SFG_Window *) value pointing to the\r
  * first window in the queue matching the specified window handle.\r

diff --git a/src/mswin/freeglut_main_mswin.c b/src/mswin/freeglut_main_mswin.c
index ca1f878..e233ecf 100644 (file)
--- a/src/mswin/freeglut_main_mswin.c
+++ b/src/mswin/freeglut_main_mswin.c
@@ -42,6 +42,13 @@ static pGetTouchInputInfo fghGetTouchInputInfo = (pGetTouchInputInfo)0xDEADBEEF;
 static pCloseTouchInputHandle fghCloseTouchInputHandle = (pCloseTouchInputHandle)0xDEADBEEF;\r
 #endif\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 void fghComputeWindowRectFromClientArea_QueryWindow( const SFG_Window *window, RECT *clientRect, BOOL posIsOutside );\r
+extern RECT fghGetClientArea                              ( const SFG_Window *window,                   BOOL wantPosOutside );\r
 \r
 \r
 void fgPlatformReshapeWindow ( SFG_Window *window, int width, int height )\r

diff --git a/src/mswin/freeglut_state_mswin.c b/src/mswin/freeglut_state_mswin.c
index e552291..8a67c4b 100644 (file)
--- a/src/mswin/freeglut_state_mswin.c
+++ b/src/mswin/freeglut_state_mswin.c
@@ -32,6 +32,14 @@
 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

diff --git a/src/mswin/freeglut_window_mswin.c b/src/mswin/freeglut_window_mswin.c
index 655820f..d53ba76 100644 (file)
--- a/src/mswin/freeglut_window_mswin.c
+++ b/src/mswin/freeglut_window_mswin.c
@@ -95,6 +95,13 @@ typedef BOOL (WINAPI *pRegisterTouchWindow)(HWND,ULONG);
 static pRegisterTouchWindow fghRegisterTouchWindow = (pRegisterTouchWindow)0xDEADBEEF;\r
 #endif\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 void fghGetBorderWidth(const DWORD windowStyle, int* xBorderWidth, int* yBorderWidth);\r
+\r
 \r
 /*\r
  * Setup the pixel format for a Win32 window\r