compilation fix

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

diff --git a/src/motif/menu.cpp b/src/motif/menu.cpp
index c5d3232ead6330e8d5bde438578366a7b2355828..b7e919489318cfd6078436810918831651140307 100644 (file)
--- a/src/motif/menu.cpp
+++ b/src/motif/menu.cpp
@@ -139,10 +139,10 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
 
 bool wxMenu::DoInsert(size_t pos, wxMenuItem *item)
 {
 
 bool wxMenu::DoInsert(size_t pos, wxMenuItem *item)
 {

-    if ( !wxMenuBase::DoInsert(pos, item) )
-        return FALSE;
+    if ( wxMenuBase::DoInsert(pos, item) )
+        return TRUE;

 
 

-    wxFAIL_MSG(wxT("not implemented"));
+    wxFAIL_MSG(wxT("DoInsert not implemented; or error in wxMenuBase::DoInsert"));

 
     return FALSE;
 }
 
     return FALSE;
 }


@@ -306,7 +306,7 @@ bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
 wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
 {
     if ( !wxMenuBarBase::Replace(pos, menu, title) )
 wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
 {
     if ( !wxMenuBarBase::Replace(pos, menu, title) )

-        return FALSE;
+        return NULL;

 
     wxFAIL_MSG(wxT("TODO"));
 
 
     wxFAIL_MSG(wxT("TODO"));
 


@@ -513,7 +513,7 @@ WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar, WXWidget parent, wxMenu * topM
     Widget buttonWidget = (Widget) 0;
     Arg args[5];
     XtSetArg (args[0], XmNnumColumns, m_numColumns);
     Widget buttonWidget = (Widget) 0;
     Arg args[5];
     XtSetArg (args[0], XmNnumColumns, m_numColumns);

-    XtSetArg (args[1], XmNpacking, XmPACK_COLUMN);
+    XtSetArg (args[1], XmNpacking, (m_numColumns > 1) ? XmPACK_COLUMN : XmPACK_TIGHT);

 
     if (!pullDown)
     {
 
     if (!pullDown)
     {