X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=freeglut-1.3%2Ffreeglut_internal.h;h=5b9df43bd12ef321f644a8d59e245a0c632ce2ca;hb=d0ce50a0da001bb3f076bab3d0adcc639ed40b5f;hp=e4968e96c6e5e7332620985d4730e8b58a43c91f;hpb=8e19a4958144b47fb4c8f9d736747df0293f19c1;p=freeglut

diff --git a/freeglut-1.3/freeglut_internal.h b/freeglut-1.3/freeglut_internal.h
index e4968e9..5b9df43 100644
--- a/freeglut-1.3/freeglut_internal.h
+++ b/freeglut-1.3/freeglut_internal.h
@@ -28,12 +28,10 @@
 #ifndef  FREEGLUT_INTERNAL_H
 #define  FREEGLUT_INTERNAL_H
 
-/*
- * Be sure to update these for every release!
- */
-#define VERSION_MAJOR      1
-#define VERSION_MINOR      3
-#define VERSION_PATCH      0
+/* XXX Update these for each release! */
+#define  VERSION_MAJOR 1
+#define  VERSION_MINOR 4
+#define  VERSION_PATCH 0 
 
 /*
  * Freeglut is meant to be available under all Unix/X11 and Win32 platforms.
@@ -126,8 +124,6 @@ typedef void (* FGCBmotion        )( int, int );
 typedef void (* FGCBpassive       )( int, int );
 typedef void (* FGCBentry         )( int );
 typedef void (* FGCBwindowStatus  )( int );
-typedef void (* FGCBmenuState     )( int );
-typedef void (* FGCBmenuStatus    )( int, int, int );
 typedef void (* FGCBselect        )( int, int, int );
 typedef void (* FGCBjoystick      )( unsigned int, int, int, int );
 typedef void (* FGCBkeyboardUp    )( unsigned char, int, int );
@@ -147,6 +143,8 @@ typedef void (* FGCBdestroy       )( void );
  */
 typedef void (* FGCBidle          )( void );
 typedef void (* FGCBtimer         )( int );
+typedef void (* FGCBmenuState     )( int );
+typedef void (* FGCBmenuStatus    )( int, int, int );
 
 /*
  * The callback used when creating/using menus
@@ -386,9 +384,11 @@ typedef struct tagSFG_Menu SFG_Menu;
 struct tagSFG_Menu
 {
     SFG_Node            Node;
+    void               *UserData ;              /* A. Donev:  User data passed back at callback */
     int                 ID;                     /* The global menu ID        */
     SFG_List            Entries;                /* The menu entries list     */
     FGCBmenu            Callback;               /* The menu callback         */
+    FGCBdestroy         Destroy;                /* A. Donev:  Destruction callback         */
     GLboolean           IsActive;               /* Is the menu selected?     */
     int                 Width;                  /* Menu box width in pixels  */
     int                 Height;                 /* Menu box height in pixels */
@@ -411,7 +411,7 @@ struct tagSFG_MenuEntry
 };
 
 /*
- * A window, making part of FreeGLUT windows hierarchy. Should be kept portable.
+ * A window, making part of freeglut windows hierarchy. Should be kept portable.
  */
 typedef struct tagSFG_Window SFG_Window;
 struct tagSFG_Window
@@ -422,6 +422,7 @@ struct tagSFG_Window
     SFG_Context         Window;                 /* Window and OpenGL context */
     SFG_WindowState     State;                  /* The window state          */
     SFG_WindowCallbacks Callbacks;              /* The window callbacks      */
+    void               *UserData ;              /* A. Donev:  A pointer to user data used in rendering */
 
     SFG_Menu*       Menu[ FREEGLUT_MAX_MENUS ]; /* Menus appended to window  */
     SFG_Menu*       ActiveMenu;                 /* The window's active menu  */