X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=include%2FGL%2Ffreeglut.h;h=3a7faa343ba9c4e32baa8797234d0b16f8b18b14;hb=3ee42232404c505950f2d616a983a304582e15a7;hp=66101c99fa55bea47a187488278a82fbb16d5d45;hpb=a86a957ae87e1b07260edec971ebdf5a98ff3d54;p=freeglut diff --git a/include/GL/freeglut.h b/include/GL/freeglut.h index 66101c9..3a7faa3 100644 --- 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,7 @@ 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 );