X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_internal.h;h=b511d0d319c1e165b1ce5f3d1fbb4a5c7d978b83;hb=4cba0748bb698d485cdad359b28ae4b2c6acc362;hp=2b93afbdbc39e410a6cf9a93687896b182563fc0;hpb=98ea79ef777bea593a87aef9600ee3d4fda6e110;p=freeglut

diff --git a/src/freeglut_internal.h b/src/freeglut_internal.h
index 2b93afb..b511d0d 100644
--- a/src/freeglut_internal.h
+++ b/src/freeglut_internal.h
@@ -31,7 +31,7 @@
 /* XXX Update these for each release! */
 #define  VERSION_MAJOR 2
 #define  VERSION_MINOR 0
-#define  VERSION_PATCH 0 
+#define  VERSION_PATCH 2 
 
 /*
  * Freeglut is meant to be available under all Unix/X11 and Win32 platforms.
@@ -310,22 +310,35 @@ struct tagSFG_Timer
 };
 
 /*
+ * Make "freeglut" window handle and context types so that we don't need so
+ * much conditionally-compiled code later in the library.
+ */
+#if TARGET_HOST_UNIX_X11
+
+typedef Window     SFG_WindowHandleType ;
+typedef GLXContext SFG_WindowContextType ;
+
+#elif TARGET_HOST_WIN32
+
+typedef HWND    SFG_WindowHandleType ;
+typedef HGLRC   SFG_WindowContextType ;
+
+#endif
+
+/*
  * A window and its OpenGL context. The contents of this structure
  * are highly dependant on the target operating system we aim at...
  */
 typedef struct tagSFG_Context SFG_Context;
 struct tagSFG_Context
 {
+    SFG_WindowHandleType  Handle;    /* The window's handle                 */
+    SFG_WindowContextType Context;   /* The window's OpenGL/WGL context     */
+
 #if TARGET_HOST_UNIX_X11
-    Window          Handle;          /* The window's handle                 */
-    GLXContext      Context;         /* The OpenGL context                  */
     XVisualInfo*    VisualInfo;      /* The window's visual information     */
-
 #elif TARGET_HOST_WIN32
-    HWND            Handle;          /* The window's handle                 */
     HDC             Device;          /* The window's device context         */
-    HGLRC           Context;         /* The window's WGL context            */
-
 #endif
 
     int             DoubleBuffered;  /* Treat the window as double-buffered */
@@ -456,12 +469,10 @@ typedef struct tagSFG_MenuContext SFG_MenuContext;
 struct tagSFG_MenuContext
 {
 #if TARGET_HOST_UNIX_X11
-    GLXContext          Context;          /* The menu OpenGL context         */
     XVisualInfo*        VisualInfo;       /* The window's visual information */
-#elif TARGET_HOST_WIN32
-    HGLRC               Context;          /* The menu window's WGL context   */
 #endif
 
+    SFG_WindowContextType Context;        /* The menu window's WGL context   */
 };
 
 /*
@@ -750,11 +761,7 @@ void fgEnumSubWindows( SFG_Window* window, FGCBenumerator enumCallback,
  * first window in the queue matching the specified window handle.
  * The function is defined in freeglut_structure.c file.
  */
-#if TARGET_HOST_UNIX_X11
-    SFG_Window* fgWindowByHandle( Window hWindow );
-#elif TARGET_HOST_WIN32
-    SFG_Window* fgWindowByHandle( HWND hWindow );
-#endif
+SFG_Window* fgWindowByHandle( SFG_WindowHandleType hWindow );
 
 /*
  * This function is similiar to the previous one, except it is
@@ -764,7 +771,7 @@ void fgEnumSubWindows( SFG_Window* window, FGCBenumerator enumCallback,
 SFG_Window* fgWindowByID( int windowID );
 
 /*
- * Looks up a menu given its ID. This is easier that fgWindowByXXX
+ * Looks up a menu given its ID. This is easier than fgWindowByXXX
  * as all menus are placed in a single doubly linked list...
  */
 SFG_Menu* fgMenuByID( int menuID );