Added stroke fonts.

[freeglut] / include / GL / freeglut.h

diff --git a/include/GL/freeglut.h b/include/GL/freeglut.h
index b4d6acb..3a7faa3 100644 (file)
--- a/include/GL/freeglut.h
+++ b/include/GL/freeglut.h
@@ -262,8 +262,8 @@
  * GLUT API macro definitions -- the glutGetModifiers parameters
  */
 #define  GLUT_ACTIVE_SHIFT                  0x0001
-#define  GLUT_ACTIVE_CTRL                   0x0004
-#define  GLUT_ACTIVE_ALT                    0x0008
+#define  GLUT_ACTIVE_CTRL                   0x0002
+#define  GLUT_ACTIVE_ALT                    0x0004
 
 /*
  * GLUT API macro definitions -- the glutSetCursor parameters
@@ -447,7 +447,9 @@ FGAPI int     FGAPIENTRY glutStrokeWidth( void* font, int character );
 FGAPI int     FGAPIENTRY glutBitmapLength( void* font, const char* string );
 FGAPI int     FGAPIENTRY glutStrokeLength( void* font, const char* string );
 FGAPI int     FGAPIENTRY glutBitmapHeight( void* font );
-FGAPI int     FGAPIENTRY glutStrokeHeight( void* font );
+FGAPI GLfloat FGAPIENTRY glutStrokeHeight( void* font );
+FGAPI void    FGAPIENTRY glutBitmapString( void* font, const char *string );
+FGAPI void    FGAPIENTRY glutStrokeString( void* font, const char *string );
 
 /*
  * Geometry functions, see freeglut_geometry.c
@@ -520,7 +522,3 @@ FGAPI void    FGAPIENTRY glutReportErrors( void );
 #endif /* FREEGLUT_H */
 
 /*** END OF FILE ***/
-
-
-
-