drawing join dots on stroke fonts is now optional (and default off)

[freeglut] / include / GL / freeglut_ext.h

diff --git a/include/GL/freeglut_ext.h b/include/GL/freeglut_ext.h
index 3826e46..9c3eee1 100644 (file)
--- a/include/GL/freeglut_ext.h
+++ b/include/GL/freeglut_ext.h
@@ -88,7 +88,7 @@
 
 #define  GLUT_GEOMETRY_VISUALIZE_NORMALS    0x0205
 
-#define  GLUT_MENU_FONT                     0x0206  /* TOOD: now glutSetOption only */
+#define  GLUT_STROKE_FONT_DRAW_JOIN_DOTS    0x0206  /* Draw dots between line segments of stroke fonts? */
 
 /*
  * New tokens for glutInitDisplayMode.
@@ -140,7 +140,7 @@ FGAPI void    FGAPIENTRY glutLeaveFullScreen( void );
 /*
  * Menu functions
  */
-FGAPI void    FGAPIENTRY glutSetMenuFont( void* font );
+FGAPI void    FGAPIENTRY glutSetMenuFont( int menuID, void* font );
 
 /*
  * Window-specific callback functions, see freeglut_callbacks.c
@@ -250,8 +250,10 @@ FGAPI void    FGAPIENTRY glutSetVertexAttribTexCoord2(GLint attrib);
 
 /* Mobile platforms lifecycle */
 FGAPI void    FGAPIENTRY glutInitContextFunc(void (* callback)());
-FGAPI void    FGAPIENTRY glutPauseFunc(void (* callback)());
-FGAPI void    FGAPIENTRY glutResumeFunc(void (* callback)());
+FGAPI void    FGAPIENTRY glutAppStatusFunc(void (* callback)(int));
+/* state flags that can be passed to callback set by glutAppStatusFunc */
+#define GLUT_APPSTATUS_PAUSE                0x0001
+#define GLUT_APPSTATUS_RESUME               0x0002
 
 /*
  * GLUT API macro definitions -- the display mode definitions