#include "config.h"
#endif
-#include "../include/GL/freeglut.h"
+#include <GL/freeglut.h>
#include "freeglut_internal.h"
/* -- DEFINITIONS ---------------------------------------------------------- */
* that that wasn't the original intent...if not, perhaps we need another
* symbolic constant, FREEGLUT_MENU_ITEM_BORDER, or such.)
*/
-#if TARGET_HOST_WIN32
+#if TARGET_HOST_WIN32 || TARGET_HOST_WINCE
#define FREEGLUT_MENU_FONT GLUT_BITMAP_8_BY_13
#else
#define FREEGLUT_MENU_FONT GLUT_BITMAP_HELVETICA_18
* too. These variables should be stuffed into global state and initialized
* via the glutInit*() system.
*/
-#if TARGET_HOST_WIN32
+#if TARGET_HOST_WIN32 || TARGET_HOST_WINCE
static float menu_pen_fore [4] = {0.0f, 0.0f, 0.0f, 1.0f};
static float menu_pen_back [4] = {0.85f, 0.85f, 0.85f, 1.0f};
static float menu_pen_hfore [4] = {1.0f, 1.0f, 1.0f, 1.0f};
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...
*/
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);
/*
* 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
/*
* Update the menu entry's width value
*/
- menuEntry->Width = glutBitmapLength( FREEGLUT_MENU_FONT,
- menuEntry->Text );
+ menuEntry->Width = glutBitmapLength(
+ FREEGLUT_MENU_FONT,
+ (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