Update compile support for OpenVMS

[wxWidgets.git] / src / motif / menu.cpp

diff --git a/src/motif/menu.cpp b/src/motif/menu.cpp
index 68eee40b912576df6d7ed11c7e7060e78bcc65fe..5f30a9549644ae55a303bc5d6fe7841b631092e3 100644 (file)
--- a/src/motif/menu.cpp
+++ b/src/motif/menu.cpp
@@ -33,8 +33,6 @@
 
 #ifdef __VMS__
 #pragma message disable nosimpint
 
 #ifdef __VMS__
 #pragma message disable nosimpint

-#define XtDisplay XTDISPLAY
-#define XtWindow XTWINDOW

 #endif
 #include <Xm/Label.h>
 #include <Xm/LabelG.h>
 #endif
 #include <Xm/Label.h>
 #include <Xm/LabelG.h>


@@ -74,7 +72,7 @@ void wxMenu::Init()
     m_popupShell = (WXWidget) NULL;
     m_buttonWidget = (WXWidget) NULL;
     m_menuId = 0;
     m_popupShell = (WXWidget) NULL;
     m_buttonWidget = (WXWidget) NULL;
     m_menuId = 0;

-    m_topLevelMenu  = (wxMenu*) NULL;
+    m_topLevelMenu  = NULL;

     m_ownedByMenuBar = false;
 
     if ( !m_title.empty() )
     m_ownedByMenuBar = false;
 
     if ( !m_title.empty() )


@@ -366,8 +364,8 @@ bool wxMenuBar::CreateMenuBar(wxFrame* parent)
             Widget tearOff = XmGetTearOffControl(GetWidget(menu));
             wxDoChangeForegroundColour((Widget) tearOff, m_foregroundColour);
             wxDoChangeBackgroundColour((Widget) tearOff, m_backgroundColour, true);
             Widget tearOff = XmGetTearOffControl(GetWidget(menu));
             wxDoChangeForegroundColour((Widget) tearOff, m_foregroundColour);
             wxDoChangeBackgroundColour((Widget) tearOff, m_backgroundColour, true);

-#endif

         }
         }

+#endif

     }
 
     PostCreation();
     }
 
     PostCreation();


@@ -385,7 +383,7 @@ bool wxMenuBar::DestroyMenuBar()
 {
     if (!m_mainWidget)
     {
 {
     if (!m_mainWidget)
     {

-        SetMenuBarFrame((wxFrame*) NULL);
+        SetMenuBarFrame(NULL);

         return false;
     }
 
         return false;
     }
 


@@ -402,7 +400,7 @@ bool wxMenuBar::DestroyMenuBar()
     XtDestroyWidget((Widget) m_mainWidget);
     m_mainWidget = (WXWidget) 0;
 
     XtDestroyWidget((Widget) m_mainWidget);
     m_mainWidget = (WXWidget) 0;
 

-    SetMenuBarFrame((wxFrame*) NULL);
+    SetMenuBarFrame(NULL);

 
     return true;
 }
 
     return true;
 }


@@ -448,7 +446,7 @@ void wxMenu::DestroyWidgetAndDetach()
 WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar,
                              WXWidget parent,
                              wxMenu * topMenu,
 WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar,
                              WXWidget parent,
                              wxMenu * topMenu,

-                             size_t WXUNUSED(index),
+                             size_t menuIndex,

                              const wxString& title,
                              bool pullDown)
 {
                              const wxString& title,
                              bool pullDown)
 {


@@ -495,7 +493,7 @@ WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar,
             XmNlabelString, label_str(),
             XmNsubMenuId, menu,
             (String)wxFont::GetFontTag(), m_font.GetFontTypeC(dpy),
             XmNlabelString, label_str(),
             XmNsubMenuId, menu,
             (String)wxFont::GetFontTag(), m_font.GetFontTypeC(dpy),

-            XmNpositionIndex, index,
+            XmNpositionIndex, menuIndex,

             NULL);
 
         if (mnem != 0)
             NULL);
 
         if (mnem != 0)


@@ -531,7 +529,7 @@ void wxMenu::DestroyMenu (bool full)
           node = node->GetNext() )
     {
         wxMenuItem *item = node->GetData();
           node = node->GetNext() )
     {
         wxMenuItem *item = node->GetData();

-        item->SetMenuBar((wxMenuBar*) NULL);
+        item->SetMenuBar(NULL);

 
         item->DestroyItem(full);
     }
 
         item->DestroyItem(full);
     }


@@ -557,7 +555,7 @@ WXWidget wxMenu::FindMenuItem (int id, wxMenuItem ** it) const
     if (id == m_menuId)
     {
         if (it)
     if (id == m_menuId)
     {
         if (it)

-            *it = (wxMenuItem*) NULL;
+            *it = NULL;

         return m_buttonWidget;
     }
 
         return m_buttonWidget;
     }
 


@@ -584,7 +582,7 @@ WXWidget wxMenu::FindMenuItem (int id, wxMenuItem ** it) const
     }
 
     if (it)
     }
 
     if (it)

-        *it = (wxMenuItem*) NULL;
+        *it = NULL;

     return (WXWidget) NULL;
 }
 
     return (WXWidget) NULL;
 }