glutBitmapString and glutBitmapLength expect (unsigned char *) rather than (char *)

[freeglut] / src / freeglut_menu.c

diff --git a/src/freeglut_menu.c b/src/freeglut_menu.c
index 9bffdf9..3ba5b22 100644 (file)
--- a/src/freeglut_menu.c
+++ b/src/freeglut_menu.c
@@ -127,7 +127,7 @@ static GLboolean fghCheckMenuStatus( SFG_Window* window, SFG_Menu* menu )
         if( menuEntry->SubMenu && menuEntry->IsActive )
         {
             /*
-             * OK, have the sub-menu checked, too. If it returns TRUE, it
+             * OK, have the sub-menu checked, too. If it returns GL_TRUE, it
              * will mean that it caught the mouse cursor and we do not need
              * to regenerate the activity list, and so our parents do...
              */
@@ -289,7 +289,7 @@ static void fghDisplayMenuBox( SFG_Menu* menu )
         glVertex2i( menu->Width - border,                border);
     glEnd( );
 
-    glColor4fv( menu_pen_back ) ;
+    glColor4fv( menu_pen_back );
     glBegin( GL_QUADS );
         glVertex2i(               border,                border);
         glVertex2i( menu->Width - border,                border);
@@ -362,7 +362,7 @@ static void fghDisplayMenuBox( SFG_Menu* menu )
         /*
          * Have the label drawn, character after character:
          */
-        glutBitmapString( FREEGLUT_MENU_FONT, menuEntry->Text);
+        glutBitmapString( FREEGLUT_MENU_FONT, (unsigned char *) menuEntry->Text);
 
         /*
          * If it's a submenu, draw a right arrow
@@ -675,14 +675,14 @@ void fghCalculateMenuBoxSize( void )
          * Update the menu entry's width value
          */
         menuEntry->Width = glutBitmapLength( FREEGLUT_MENU_FONT,
-                                             menuEntry->Text );
+                                             (unsigned char *) menuEntry->Text );
 
         /*
          * If the entry is a submenu, then it needs to be wider to
          * accomodate the arrow. JCJ 31 July 2003
          */
         if (menuEntry->SubMenu )
-            menuEntry->Width += glutBitmapLength( FREEGLUT_MENU_FONT, "_" );
+            menuEntry->Width += glutBitmapLength( FREEGLUT_MENU_FONT, (unsigned char *) "_" );
 
         /*
          * Check if it's the biggest we've found