X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=include%2FGL%2Ffreeglut_ext.h;h=04ec79d18d030f475ed55fcb33d8cdd019a46948;hb=164f40e04e857b4edd4f58427cae44ceb85dbce0;hp=7369f0f13ed48852d26730ef42713be4fbc32e1b;hpb=9b943faa4f374b5a37b1bf6d544f826078cd361b;p=freeglut diff --git a/include/GL/freeglut_ext.h b/include/GL/freeglut_ext.h index 7369f0f..04ec79d 100644 --- a/include/GL/freeglut_ext.h +++ b/include/GL/freeglut_ext.h @@ -1,5 +1,5 @@ -#ifndef FREEGLUT_EXT_H -#define FREEGLUT_EXT_H +#ifndef __FREEGLUT_EXT_H__ +#define __FREEGLUT_EXT_H__ /* * freeglut_ext.h @@ -66,6 +66,7 @@ FGAPI void FGAPIENTRY glutLeaveMainLoop( void ); /* * Window-specific callback functions, see freeglut_callbacks.c */ +FGAPI void FGAPIENTRY glutMouseWheelFunc( void (* callback)( int, int, int, int ) ); FGAPI void FGAPIENTRY glutCloseFunc( void (* callback)( void ) ); FGAPI void FGAPIENTRY glutWMCloseFunc( void (* callback)( void ) ); /* A. Donev: Also a destruction callback for menus */ @@ -86,8 +87,8 @@ FGAPI void FGAPIENTRY glutSetMenuData(void* data); */ FGAPI int FGAPIENTRY glutBitmapHeight( 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 ); +FGAPI void FGAPIENTRY glutBitmapString( void* font, const unsigned char *string ); +FGAPI void FGAPIENTRY glutStrokeString( void* font, const unsigned char *string ); /* * Geometry functions, see freeglut_geometry.c @@ -109,5 +110,4 @@ FGAPI void * FGAPIENTRY glutGetProcAddress( const char *procName ); /*** END OF FILE ***/ -#endif /* FREEGLUT_EXT_H */ - +#endif /* __FREEGLUT_EXT_H__ */