Changeset 3083 for trunk/src/opengl/glut/win32_menu.c

Timestamp:

Mar 11, 2000, 4:07:48 PM (25 years ago)

Author:

sandervl

Message:

compile fixes + cleanup

File:

• trunk/src/opengl/glut/win32_menu.c (modified) (17 diffs)

trunk/src/opengl/glut/win32_menu.c

@@ -1 @@
-/* $Id: win32_menu.c,v 1.4 2000-03-11 09:05:05 jeroen Exp $ */
+/* $Id: win32_menu.c,v 1.5 2000-03-11 15:07:48 sandervl Exp $ */
 /* Copyright (c) Mark J. Kilgard, 1994, 1997, 1998. */
 /* Copyright (c) Nate Robins, 1997. */
@@ -30 +30 @@
 
 /* DEPRICATED, use glutMenuStatusFunc instead. */
-void APIENTRY
+void GLAPIENTRY
 glutMenuStateFunc(GLUTmenuStateCB menuStateFunc)
 {
@@ -36 +36 @@
 }
 
-void APIENTRY
+void GLAPIENTRY
 glutMenuStatusFunc(GLUTmenuStatusCB menuStatusFunc)
 {
@@ -233 +233 @@
 }
 
-int APIENTRY
+int GLAPIENTRY
 glutCreateMenu(GLUTselectCB selectFunc)
 {
@@ -261 +261 @@
 }
 
-void APIENTRY
+void GLAPIENTRY
 glutDestroyMenu(int menunum)
 {
@@ -288 +288 @@
 }
 
-int APIENTRY
+int GLAPIENTRY
 glutGetMenu(void)
 {
@@ -298 +298 @@
 }
 
-void APIENTRY
+void GLAPIENTRY
 glutSetMenu(int menuid)
 {
@@ -330 +330 @@
   item->value = value;
   item->unique = uniqueMenuHandler++;
-#if defined(__WIN32OS2__)
-  if (isTrigger) {
-    AppendMenuA(menu->win, MF_POPUP, (UINT)item->win, label);
-  } else {
-    AppendMenuA(menu->win, MF_STRING, item->unique, label);
-  }
-#else
   if (isTrigger) {
     AppendMenu(menu->win, MF_POPUP, (UINT)item->win, label);
@@ -342 +335 @@
     AppendMenu(menu->win, MF_STRING, item->unique, label);
   }
-#endif
-}
-
-void APIENTRY
+}
+
+void GLAPIENTRY
 glutAddMenuEntry(const char *label, int value)
 {
@@ -364 +356 @@
 }
 
-void APIENTRY
+void GLAPIENTRY
 glutAddSubMenu(const char *label, int menu)
 {
@@ -389 +381 @@
 }
 
-void APIENTRY
+void GLAPIENTRY
 glutChangeToMenuEntry(int num, const char *label, int value)
 {
@@ -418 +410 @@
       item->value = value;
       item->unique = uniqueMenuHandler++;
-#if defined(__WIN32OS2__)
-      ModifyMenuA(__glutCurrentMenu->win, (UINT) i - 1,
-        MF_BYPOSITION | MFT_STRING, item->unique, label);
-#else
       ModifyMenu(__glutCurrentMenu->win, (UINT) i - 1,
         MF_BYPOSITION | MFT_STRING, item->unique, label);
-#endif
       return;
     }
@@ -433 +420 @@
 }
 
-void APIENTRY
+void GLAPIENTRY
 glutChangeToSubMenu(int num, const char *label, int menu)
 {
@@ -465 +452 @@
       if (popupmenu)
         item->win = popupmenu->win;
-#if defined(__WIN32OS2__)
-      ModifyMenuA(__glutCurrentMenu->win, (UINT) i - 1,
-        MF_BYPOSITION | MF_POPUP, (UINT) item->win, label);
-#else
       ModifyMenu(__glutCurrentMenu->win, (UINT) i - 1,
         MF_BYPOSITION | MF_POPUP, (UINT) item->win, label);
-#endif
       return;
     }
@@ -480 +462 @@
 }
 
-void APIENTRY
+void GLAPIENTRY
 glutRemoveMenuItem(int num)
 {
@@ -513 +495 @@
 }
 
-void APIENTRY
+void GLAPIENTRY
 glutAttachMenu(int button)
 {
@@ -529 +511 @@
 }
 
-void APIENTRY
+void GLAPIENTRY
 glutDetachMenu(int button)
 {