0, /* FPSInterval */
0, /* SwapCount */
0, /* SwapTime */
-#ifdef TARGET_HOST_WIN32
+#if TARGET_HOST_WIN32
{ 0, FALSE }, /* Time */
#else
{ { 0, 0 }, FALSE },
#endif
{ NULL, NULL }, /* Timers */
NULL, /* IdleCallback */
+ FALSE, /* BuildingAMenu */
+ 0, /* ActiveMenus */
NULL, /* MenuStateCallback */
NULL, /* MenuStatusCallback */
{ 640, 480, TRUE }, /* GameModeSize */
}
/*
+ * If there was a menu created, destroy the rendering context
+ */
+ if ( fgStructure.MenuContext )
+ {
+ free ( fgStructure.MenuContext ) ;
+ fgStructure.MenuContext = NULL ;
+ }
+
+ /*
* Perform the freeglut structure deinitialization
*/
fgDestroyStructure();
/*
* Delete all the timers and their storage list
*/
- while ( (timer = fgState.Timers.First) != NULL )
+ while ( (timer = (SFG_Timer *)fgState.Timers.First) != NULL )
{
fgListRemove ( &fgState.Timers, &timer->Node ) ;
free ( timer ) ;
*/
char *token ;
int len = strlen ( displayMode ) ;
- char *buffer = malloc ( (len+1) * sizeof(char) ) ;
+ char *buffer = (char *)malloc ( (len+1) * sizeof(char) ) ;
memcpy ( buffer, displayMode, len ) ;
buffer[len] = '\0' ;
break ;
case 20 : /* "win32pdf": matches the Win32 Pixel Format Descriptor by number */
-#ifdef TARGET_HOST_WIN32
+#if TARGET_HOST_WIN32
#endif
break ;
case 21 : /* "xvisual": matches the X visual ID by number */
-#ifdef TARGET_HOST_UNIX_X11
+#if TARGET_HOST_UNIX_X11
#endif
break ;
case 22 : /* "xstaticgray": boolean indicating if the frame buffer configuration's X visual is of type StaticGray */
-#ifdef TARGET_HOST_UNIX_X11
+#if TARGET_HOST_UNIX_X11
#endif
break ;
case 23 : /* "xgrayscale": boolean indicating if the frame buffer configuration's X visual is of type GrayScale */
-#ifdef TARGET_HOST_UNIX_X11
+#if TARGET_HOST_UNIX_X11
#endif
break ;
case 24 : /* "xstaticcolor": boolean indicating if the frame buffer configuration's X visual is of type StaticColor */
-#ifdef TARGET_HOST_UNIX_X11
+#if TARGET_HOST_UNIX_X11
#endif
break ;
case 25 : /* "xpseudocolor": boolean indicating if the frame buffer configuration's X visual is of type PseudoColor */
-#ifdef TARGET_HOST_UNIX_X11
+#if TARGET_HOST_UNIX_X11
#endif
break ;
case 26 : /* "xtruecolor": boolean indicating if the frame buffer configuration's X visual is of type TrueColor */
-#ifdef TARGET_HOST_UNIX_X11
+#if TARGET_HOST_UNIX_X11
#endif
break ;
case 27 : /* "xdirectcolor": boolean indicating if the frame buffer configuration's X visual is of type DirectColor */
-#ifdef TARGET_HOST_UNIX_X11
+#if TARGET_HOST_UNIX_X11
#endif
break ;