basic support for encodings for wxMSW::wxFont

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

diff --git a/src/motif/menu.cpp b/src/motif/menu.cpp
index c02f30d72a123d588a60d7510acb77f975a2c2dc..ed12ce6732e24f0343b8bedfcc6880987d577b20 100644 (file)
--- a/src/motif/menu.cpp
+++ b/src/motif/menu.cpp
@@ -778,9 +778,7 @@ bool wxMenuBar::CreateMenuBar(wxFrame* parent)
         wxString title(m_titles[i]);
         menu->SetButtonWidget(menu->CreateMenu (this, menuBarW, menu, title, TRUE));
 
         wxString title(m_titles[i]);
         menu->SetButtonWidget(menu->CreateMenu (this, menuBarW, menu, title, TRUE));
 

-        wxStripMenuCodes ((char*) (const char*) title, wxBuffer);
-
-        if (strcmp (wxBuffer, "Help") == 0)
+        if (strcmp (wxStripMenuCodes(title), "Help") == 0)

             XtVaSetValues ((Widget) menuBarW, XmNmenuHelpWidget, (Widget) menu->GetButtonWidget(), NULL);
 
         // tear off menu support
             XtVaSetValues ((Widget) menuBarW, XmNmenuHelpWidget, (Widget) menu->GetButtonWidget(), NULL);
 
         // tear off menu support


@@ -910,21 +908,20 @@ WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar, WXWidget parent, wxMenu * topM
 
         menu = XmCreatePulldownMenu ((Widget) parent, "pulldown", args, 2);
 
 
         menu = XmCreatePulldownMenu ((Widget) parent, "pulldown", args, 2);
 

-        XmString label_str = XmStringCreateSimple (wxBuffer);
-        buttonWidget = XtVaCreateManagedWidget (wxBuffer,
+        wxString title2(wxStripMenuCodes(title));
+        wxXmString label_str(title2);
+        buttonWidget = XtVaCreateManagedWidget(title2,

 #if wxUSE_GADGETS
             xmCascadeButtonGadgetClass, (Widget) parent,
 #else
             xmCascadeButtonWidgetClass, (Widget) parent,
 #endif
 #if wxUSE_GADGETS
             xmCascadeButtonGadgetClass, (Widget) parent,
 #else
             xmCascadeButtonWidgetClass, (Widget) parent,
 #endif

-            XmNlabelString, label_str,
+            XmNlabelString, label_str(),

             XmNsubMenuId, menu,
             NULL);
 
         if (mnem != 0)
             XtVaSetValues (buttonWidget, XmNmnemonic, mnem, NULL);
             XmNsubMenuId, menu,
             NULL);
 
         if (mnem != 0)
             XtVaSetValues (buttonWidget, XmNmnemonic, mnem, NULL);

-
-        XmStringFree (label_str);

     }
 
     m_menuWidget = (WXWidget) menu;
     }
 
     m_menuWidget = (WXWidget) menu;