X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9874b4ee8308b8989c5df7db4f3559625299d0a4..2b8f5a2488b051daf6f9c0d161e57e0d1dabeab0:/src/motif/menuitem.cpp

diff --git a/src/motif/menuitem.cpp b/src/motif/menuitem.cpp
index 577cf2f7ab..d582065f47 100644
--- a/src/motif/menuitem.cpp
+++ b/src/motif/menuitem.cpp
@@ -26,6 +26,9 @@
 #include "wx/utils.h"
 #include "wx/frame.h"
 
+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif
 #include <Xm/Label.h>
 #include <Xm/LabelG.h>
 #include <Xm/CascadeBG.h>
@@ -35,6 +38,9 @@
 #include <Xm/ToggleB.h>
 #include <Xm/ToggleBG.h>
 #include <Xm/RowColumn.h>
+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif
 
 #include "wx/motif/private.h"
 
@@ -150,7 +156,29 @@ void wxMenuItem::Check(bool bDoCheck)
     }
 }
 
-//// Motif-specific
+wxString wxMenuItem::GetLabel() const
+{
+    return wxStripMenuCodes(m_text);
+}
+
+
+// ----------------------------------------------------------------------------
+// wxMenuItemBase
+// ----------------------------------------------------------------------------
+
+wxMenuItem *wxMenuItemBase::New(wxMenu *parentMenu,
+                                int id,
+                                const wxString& name,
+                                const wxString& help,
+                                bool isCheckable,
+                                wxMenu *subMenu)
+{
+    return new wxMenuItem(parentMenu, id, name, help, isCheckable, subMenu);
+}
+
+// ----------------------------------------------------------------------------
+// Motif-specific
+// ----------------------------------------------------------------------------
 
 void wxMenuItem::CreateItem (WXWidget menu, wxMenuBar * menuBar, wxMenu * topMenu)
 {
@@ -292,7 +320,7 @@ void wxMenuItem::SetText(const wxString& label)
     {
         wxXmString label_str(label2);
         XtVaSetValues ((Widget) m_buttonWidget,
-            XmNlabelString, label_str,
+            XmNlabelString, label_str(),
             NULL);
         if (mnem != 0)
             XtVaSetValues ((Widget) m_buttonWidget, XmNmnemonic, mnem, NULL);