cleanup and some WGL PIXELFORMAT issues

[mesa.git] / src / glut / glx / win32_menu.c

diff --git a/src/glut/glx/win32_menu.c b/src/glut/glx/win32_menu.c
index 9b330644af1d91ec0c26005116c16c2f7067c5ac..5ce264dcdb7d8441ecab360e862a9f920e29dcb3 100644 (file)
--- a/src/glut/glx/win32_menu.c
+++ b/src/glut/glx/win32_menu.c
@@ -29,13 +29,13 @@ static int menuListSize = 0;
 static UINT uniqueMenuHandler = 1;
 
 /* DEPRICATED, use glutMenuStatusFunc instead. */
-void APIENTRY
+void GLUTAPIENTRY
 glutMenuStateFunc(GLUTmenuStateCB menuStateFunc)
 {
   __glutMenuStatusFunc = (GLUTmenuStatusCB) menuStateFunc;
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutMenuStatusFunc(GLUTmenuStatusCB menuStatusFunc)
 {
   __glutMenuStatusFunc = menuStatusFunc;
@@ -96,9 +96,8 @@ __glutFinishMenu(Window win, int x, int y)
 static void
 mapMenu(GLUTmenu * menu, int x, int y)
 {
-  TrackPopupMenu(menu->win, TPM_LEFTALIGN |
-    __glutMenuButton == TPM_RIGHTBUTTON ? 
-    TPM_RIGHTBUTTON : TPM_LEFTBUTTON,
+  TrackPopupMenu((HMENU) menu->win, TPM_LEFTALIGN |
+    (__glutMenuButton == TPM_RIGHTBUTTON) ? TPM_RIGHTBUTTON : TPM_LEFTBUTTON,
     x, y, 0, __glutCurrentWindow->win, NULL);
 }
 
@@ -232,7 +231,7 @@ menuModificationError(void)
   __glutFatalError("menu manipulation not allowed while menus in use.");
 }
 
-int APIENTRY
+int GLUTAPIENTRY
 glutCreateMenu(GLUTselectCB selectFunc)
 {
   GLUTmenu *menu;
@@ -254,20 +253,20 @@ glutCreateMenu(GLUTselectCB selectFunc)
   menu->cascade = NULL;
   menu->highlighted = NULL;
   menu->anchor = NULL;
-  menu->win = CreatePopupMenu();
+  menu->win = (HWND) CreatePopupMenu();
   menuList[menuid] = menu;
   __glutSetMenu(menu);
   return menuid + 1;
 }
 
-int APIENTRY
+int GLUTAPIENTRY
 __glutCreateMenuWithExit(GLUTselectCB selectFunc, void (__cdecl *exitfunc)(int))
 {
   __glutExitFunc = exitfunc;
   return glutCreateMenu(selectFunc);
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutDestroyMenu(int menunum)
 {
   GLUTmenu *menu = __glutGetMenuByNum(menunum);
@@ -277,7 +276,7 @@ glutDestroyMenu(int menunum)
     menuModificationError();
   }
   assert(menu->id == menunum - 1);
-  DestroyMenu(menu->win);
+  DestroyMenu( (HMENU) menu->win);
   menuList[menunum - 1] = NULL;
   /* free all menu entries */
   item = menu->list;
@@ -294,7 +293,7 @@ glutDestroyMenu(int menunum)
   free(menu);
 }
 
-int APIENTRY
+int GLUTAPIENTRY
 glutGetMenu(void)
 {
   if (__glutCurrentMenu) {
@@ -304,7 +303,7 @@ glutGetMenu(void)
   }
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutSetMenu(int menuid)
 {
   GLUTmenu *menu;
@@ -337,13 +336,13 @@ setMenuItem(GLUTmenuItem * item, const char *label,
   item->value = value;
   item->unique = uniqueMenuHandler++;
   if (isTrigger) {
-    AppendMenu(menu->win, MF_POPUP, (UINT)item->win, label);
+    AppendMenu((HMENU) menu->win, MF_POPUP, (UINT)item->win, label);
   } else {
-    AppendMenu(menu->win, MF_STRING, item->unique, label);
+    AppendMenu((HMENU) menu->win, MF_STRING, item->unique, label);
   }
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutAddMenuEntry(const char *label, int value)
 {
   GLUTmenuItem *entry;
@@ -362,7 +361,7 @@ glutAddMenuEntry(const char *label, int value)
   __glutCurrentMenu->list = entry;
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutAddSubMenu(const char *label, int menu)
 {
   GLUTmenuItem *submenu;
@@ -387,7 +386,7 @@ glutAddSubMenu(const char *label, int menu)
   __glutCurrentMenu->list = submenu;
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutChangeToMenuEntry(int num, const char *label, int value)
 {
   GLUTmenuItem *item;
@@ -405,7 +404,7 @@ glutChangeToMenuEntry(int num, const char *label, int value)
            need to account for submenus.  */
         item->menu->submenus--;
        /* Nuke the Win32 menu. */
-       DestroyMenu(item->win);         
+       DestroyMenu((HMENU) item->win);
       }
       free(item->label);
 
@@ -416,7 +415,7 @@ glutChangeToMenuEntry(int num, const char *label, int value)
       item->len = (int) strlen(label);
       item->value = value;
       item->unique = uniqueMenuHandler++;
-      ModifyMenu(__glutCurrentMenu->win, (UINT) i - 1,
+      ModifyMenu((HMENU) __glutCurrentMenu->win, (UINT) i - 1,
         MF_BYPOSITION | MFT_STRING, item->unique, label);
 
       return;
@@ -427,7 +426,7 @@ glutChangeToMenuEntry(int num, const char *label, int value)
   __glutWarning("Current menu has no %d item.", num);
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutChangeToSubMenu(int num, const char *label, int menu)
 {
   GLUTmenu *popupmenu;
@@ -445,7 +444,7 @@ glutChangeToSubMenu(int num, const char *label, int menu)
         /* If changing a menu entry to as submenu trigger, we
            need to account for submenus.  */
         item->menu->submenus++;
-       item->win = CreatePopupMenu();
+       item->win = (HWND) CreatePopupMenu();
       }
       free(item->label);
       
@@ -459,7 +458,7 @@ glutChangeToSubMenu(int num, const char *label, int menu)
       popupmenu = __glutGetMenuByNum(menu);
       if (popupmenu)
        item->win = popupmenu->win;
-      ModifyMenu(__glutCurrentMenu->win, (UINT) i - 1,
+      ModifyMenu((HMENU) __glutCurrentMenu->win, (UINT) i - 1,
         MF_BYPOSITION | MF_POPUP, (UINT) item->win, label);
       return;
     }
@@ -469,7 +468,7 @@ glutChangeToSubMenu(int num, const char *label, int menu)
   __glutWarning("Current menu has no %d item.", num);
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutRemoveMenuItem(int num)
 {
   GLUTmenuItem *item, **prev;
@@ -489,7 +488,7 @@ glutRemoveMenuItem(int num)
       /* Patch up menu's item list. */
       *prev = item->next;
 
-      RemoveMenu(__glutCurrentMenu->win, (UINT) i - 1, MF_BYPOSITION);
+      RemoveMenu((HMENU) __glutCurrentMenu->win, (UINT) i - 1, MF_BYPOSITION);
 
       free(item->label);
       free(item);
@@ -502,7 +501,7 @@ glutRemoveMenuItem(int num)
   __glutWarning("Current menu has no %d item.", num);
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutAttachMenu(int button)
 {
   if (__glutCurrentWindow == __glutGameModeWindow) {
@@ -518,7 +517,7 @@ glutAttachMenu(int button)
   __glutCurrentWindow->menu[button] = __glutCurrentMenu->id + 1;
 }
 
-void APIENTRY
+void GLUTAPIENTRY
 glutDetachMenu(int button)
 {
   if (__glutMappedMenu) {