X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_menu.c;h=ec2ff456e91be735e3aeac30bf5fcf6fbe166e4a;hb=7fdce1253e14170b6cb933f13c1f2a1644c93793;hp=05fd2bd52f5e3d4302801b32623a7e3d9bad628b;hpb=90a9927d3b46439645e1c1d1aa9709bc106451be;p=freeglut diff --git a/src/freeglut_menu.c b/src/freeglut_menu.c index 05fd2bd..ec2ff45 100644 --- a/src/freeglut_menu.c +++ b/src/freeglut_menu.c @@ -52,7 +52,7 @@ * 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 || TARGET_HOST_WINCE +#if TARGET_HOST_MS_WINDOWS #define FREEGLUT_MENU_FONT GLUT_BITMAP_8_BY_13 #else #define FREEGLUT_MENU_FONT GLUT_BITMAP_HELVETICA_18 @@ -71,7 +71,7 @@ * too. These variables should be stuffed into global state and initialized * via the glutInit*() system. */ -#if TARGET_HOST_WIN32 || TARGET_HOST_WINCE +#if TARGET_HOST_MS_WINDOWS 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}; @@ -140,9 +140,9 @@ static void fghDeactivateSubMenu( SFG_MenuEntry *menuEntry ) */ static GLvoid fghGetVMaxExtent( SFG_Window* window, int* x, int* y ) { - if( fgStructure.GameMode ) + if( fgStructure.GameModeWindow ) { -#if TARGET_HOST_UNIX_X11 +#if TARGET_HOST_POSIX_X11 int wx, wy; Window w;