Motif: made file selector and message box properly take on background colour.

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

diff --git a/src/motif/menu.cpp b/src/motif/menu.cpp
index cc88c9806edc430d8e4526eb367b825472a3bfe1..48dcafe35f0b4b8ca05ed0073072ff7fc6526c66 100644 (file)
--- a/src/motif/menu.cpp
+++ b/src/motif/menu.cpp
@@ -498,7 +498,7 @@ void wxMenuBar::Enable(int id, bool flag)
     item->Enable(flag);
 }
 
-void wxMenuBar::EnableTop(int pos, bool flag)
+void wxMenuBar::EnableTop(int WXUNUSED(pos), bool WXUNUSED(flag))
 {
     // TODO
 }
@@ -604,7 +604,7 @@ wxString wxMenuBar::GetLabelTop(int pos) const
 
 }
 
-bool wxMenuBar::OnDelete(wxMenu *menu, int pos)
+bool wxMenuBar::OnDelete(wxMenu *menu, int WXUNUSED(pos))
 {
     // Only applies to dynamic deletion (when set in frame)
     if (!m_menuBarFrame)
@@ -860,8 +860,8 @@ int PostDeletionOfMenu( XtPointer* clientData )
 }
 
 void
-wxMenuPopdownCallback(Widget w, XtPointer clientData,
-                      XtPointer ptr)
+wxMenuPopdownCallback(Widget WXUNUSED(w), XtPointer clientData,
+                      XtPointer WXUNUSED(ptr))
 {
     wxMenu *menu = (wxMenu *)clientData;
 
@@ -916,7 +916,7 @@ WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar, WXWidget parent, wxMenu * topM
 #else
             xmCascadeButtonWidgetClass, (Widget) parent,
 #endif
-            XmNlabelString, label_str,
+            XmNlabelString, label_str(),
             XmNsubMenuId, menu,
             NULL);
 
@@ -1114,7 +1114,7 @@ void wxMenuBar::SetForegroundColour(const wxColour& col)
         m_menus[i]->SetForegroundColour((wxColour&) col);
 }
 
-void wxMenuBar::ChangeFont(bool keepOriginalSize)
+void wxMenuBar::ChangeFont(bool WXUNUSED(keepOriginalSize))
 {
     // Nothing to do for menubar, fonts are kept in wxMenus
 }