X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fmswin%2Ffg_window_mswin.c;h=7aef7a7715d5523e318477b79fe0ae6010ff00fe;hb=6a9540715abb6477b2a55e0a54246bfea66dfb95;hp=bc6b886826c93dcb2f43ad921eba33f14bd67965;hpb=0e653a9d94fec583f7a4172b721c1c599e06cbc8;p=freeglut

diff --git a/src/mswin/fg_window_mswin.c b/src/mswin/fg_window_mswin.c
index bc6b886..7aef7a7 100644
--- a/src/mswin/fg_window_mswin.c
+++ b/src/mswin/fg_window_mswin.c
@@ -85,13 +85,6 @@ typedef BOOL (WINAPI *pRegisterTouchWindow)(HWND,ULONG);
 static pRegisterTouchWindow fghRegisterTouchWindow = (pRegisterTouchWindow)0xDEADBEEF;
 #endif
 
-/* 
- * Helper functions for getting client area from the window rect
- * and the window rect from the client area given the style of the window
- * (or a valid window pointer from which the style can be queried).
- */
-extern void fghGetBorderWidth(const DWORD windowStyle, int* xBorderWidth, int* yBorderWidth);
-
 
 /*
  * Setup the pixel format for a Win32 window
@@ -378,6 +371,28 @@ void fgPlatformSetWindow ( SFG_Window *window )
 }
 
 
+/* Returns the width of the window borders based on the window's style.
+*/
+void fghGetBorderWidth(const DWORD windowStyle, int* xBorderWidth, int* yBorderWidth)
+{
+    if (windowStyle & WS_THICKFRAME)
+    {
+        *xBorderWidth = GetSystemMetrics(SM_CXSIZEFRAME);
+        *yBorderWidth = GetSystemMetrics(SM_CYSIZEFRAME);
+    }
+    else if (windowStyle & WS_DLGFRAME)
+    {
+        *xBorderWidth = GetSystemMetrics(SM_CXFIXEDFRAME);
+        *yBorderWidth = GetSystemMetrics(SM_CYFIXEDFRAME);
+    }
+    else
+    {
+        *xBorderWidth = 0;
+        *yBorderWidth = 0;
+    }
+}
+
+
 
 /* Computes position of corners of window Rect (outer position including
  * decorations) based on the provided client rect and based on the style
@@ -507,6 +522,8 @@ RECT fghGetClientArea( const SFG_Window *window, BOOL wantPosOutside )
     /*
      * call GetWindowRect()
      * (this returns the pixel coordinates of the outside of the window)
+     * cannot use GetClientRect as it seems to return a rect relative to
+     * the top-left point of the client area (.top and .left are thus always 0)
      */
     GetWindowRect( window->Window.Handle, &windowRect );
 
@@ -516,27 +533,6 @@ RECT fghGetClientArea( const SFG_Window *window, BOOL wantPosOutside )
     return windowRect;
 }
 
-/* Returns the width of the window borders based on the window's style.
- */
-void fghGetBorderWidth(const DWORD windowStyle, int* xBorderWidth, int* yBorderWidth)
-{
-    if (windowStyle & WS_THICKFRAME)
-    {
-        *xBorderWidth = GetSystemMetrics(SM_CXSIZEFRAME);
-        *yBorderWidth = GetSystemMetrics(SM_CYSIZEFRAME);
-    }
-    else if (windowStyle & WS_DLGFRAME)
-    {
-        *xBorderWidth = GetSystemMetrics(SM_CXFIXEDFRAME);
-        *yBorderWidth = GetSystemMetrics(SM_CYFIXEDFRAME);
-    }
-    else
-    {
-        *xBorderWidth = 0;
-        *yBorderWidth = 0;
-    }
-}
-
 #if(WINVER >= 0x500)
 typedef struct
 {
@@ -808,7 +804,6 @@ void fgPlatformOpenWindow( SFG_Window* window, const char* title,
 
     UpdateWindow( window->Window.Handle );
     ShowCursor( TRUE );  /* XXX Old comments say "hide cursor"! */
-
 }
 
 
@@ -889,6 +884,8 @@ void fgPlatformGlutSetWindowTitle( const char* title )
 
 /*
  * Set the current window's iconified title
+ * There really isn't a way to set the icon name separate from the
+ * windows name in Win32, so, just set the windows name.
  */
 void fgPlatformGlutSetIconTitle( const char* title )
 {