Assert correction.

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

diff --git a/src/motif/menu.cpp b/src/motif/menu.cpp
index d08b9fe4d36999737ca716cd902c64235536516b..61f37764db380bd1e2c95b53769918dba65ecc87 100644 (file)
--- a/src/motif/menu.cpp
+++ b/src/motif/menu.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 


@@ -79,9 +79,9 @@ void wxMenu::Init()
     m_buttonWidget = (WXWidget) NULL;
     m_menuId = 0;
     m_topLevelMenu  = (wxMenu*) NULL;
     m_buttonWidget = (WXWidget) NULL;
     m_menuId = 0;
     m_topLevelMenu  = (wxMenu*) NULL;

-    m_ownedByMenuBar = FALSE;
+    m_ownedByMenuBar = false;

 
 

-    if ( !!m_title )
+    if ( !m_title.empty() )

     {
         Append(-3, m_title) ;
         AppendSeparator() ;
     {
         Append(-3, m_title) ;
         AppendSeparator() ;


@@ -98,9 +98,9 @@ wxMenu::~wxMenu()
     if (m_menuWidget)
     {
         if (m_menuParent)
     if (m_menuWidget)
     {
         if (m_menuParent)

-            DestroyMenu(TRUE);
+            DestroyMenu(true);

         else
         else

-            DestroyMenu(FALSE);
+            DestroyMenu(false);

     }
 
     // Not sure if this is right
     }
 
     // Not sure if this is right


@@ -135,7 +135,7 @@ wxMenuItem* wxMenu::DoAppend(wxMenuItem *pItem)
 
 wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
 {
 
 wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
 {

-    item->DestroyItem(TRUE);
+    item->DestroyItem(true);

 
     return wxMenuBase::DoRemove(item);
 }
 
     return wxMenuBase::DoRemove(item);
 }


@@ -171,16 +171,7 @@ void wxMenu::SetTitle(const wxString& label)
 
 bool wxMenu::ProcessCommand(wxCommandEvent & event)
 {
 
 bool wxMenu::ProcessCommand(wxCommandEvent & event)
 {

-    bool processed = FALSE;
-
-#if wxUSE_MENU_CALLBACK
-    // Try a callback
-    if (m_callback)
-    {
-        (void) (*(m_callback)) (*this, event);
-        processed = TRUE;
-    }
-#endif // wxUSE_MENU_CALLBACK
+    bool processed = false;

 
     // Try the menu's event handler
     if ( !processed && GetEventHandler())
 
     // Try the menu's event handler
     if ( !processed && GetEventHandler())


@@ -209,22 +200,22 @@ void wxMenuBar::Init()
     m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
 }
 
     m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
 }
 

-wxMenuBar::wxMenuBar(int n, wxMenu *menus[], const wxArrayString& titles)
+wxMenuBar::wxMenuBar(size_t n, wxMenu *menus[], const wxArrayString& titles, long WXUNUSED(style))

 {
 {

-    wxASSERT( size_t(n) == titles.GetCount() );
+    wxASSERT( n == titles.GetCount() );

 
     Init();
 
     m_titles = titles;
 
     Init();
 
     m_titles = titles;

-    for ( int i = 0; i < n; i++ )
+    for ( size_t i = 0; i < n; i++ )

         m_menus.Append(menus[i]);
 }
 
         m_menus.Append(menus[i]);
 }
 

-wxMenuBar::wxMenuBar(int n, wxMenu *menus[], const wxString titles[])
+wxMenuBar::wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long WXUNUSED(style))

 {
     Init();
 
 {
     Init();
 

-    for ( int i = 0; i < n; i++ )
+    for ( size_t i = 0; i < n; i++ )

     {
         m_menus.Append(menus[i]);
         m_titles.Add(titles[i]);
     {
         m_menus.Append(menus[i]);
         m_titles.Add(titles[i]);


@@ -281,14 +272,14 @@ wxString wxMenuBar::GetLabelTop(size_t pos) const
 
 bool wxMenuBar::Append(wxMenu * menu, const wxString& title)
 {
 
 bool wxMenuBar::Append(wxMenu * menu, const wxString& title)
 {

-    wxCHECK_MSG( menu, FALSE, wxT("invalid menu") );
-    wxCHECK_MSG( !menu->GetParent() && !menu->GetButtonWidget(), FALSE,
+    wxCHECK_MSG( menu, false, wxT("invalid menu") );
+    wxCHECK_MSG( !menu->GetParent() && !menu->GetButtonWidget(), false,

                  wxT("menu already appended") );
 
     if ( m_menuBarFrame )
     {
                  wxT("menu already appended") );
 
     if ( m_menuBarFrame )
     {

-        WXWidget w = menu->CreateMenu(this, GetMainWidget(), menu, title, TRUE);
-        wxCHECK_MSG( w, FALSE, wxT("failed to create menu") );
+        WXWidget w = menu->CreateMenu(this, GetMainWidget(), menu, title, true);
+        wxCHECK_MSG( w, false, wxT("failed to create menu") );

         menu->SetButtonWidget(w);
     }
 
         menu->SetButtonWidget(w);
     }
 


@@ -300,11 +291,11 @@ bool wxMenuBar::Append(wxMenu * menu, const wxString& title)
 bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
 {
     if ( !wxMenuBarBase::Insert(pos, menu, title) )
 bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
 {
     if ( !wxMenuBarBase::Insert(pos, menu, title) )

-        return FALSE;
+        return false;

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

-    return FALSE;
+    return false;

 }
 
 wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
 }
 
 wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)


@@ -324,7 +315,7 @@ wxMenu *wxMenuBar::Remove(size_t pos)
         return NULL;
 
     if ( m_menuBarFrame )
         return NULL;
 
     if ( m_menuBarFrame )

-        menu->DestroyMenu(TRUE);
+        menu->DestroyMenu(true);

 
     menu->SetMenuBar(NULL);
 
 
     menu->SetMenuBar(NULL);
 


@@ -375,10 +366,11 @@ bool wxMenuBar::CreateMenuBar(wxFrame* parent)
         XtManageChild((Widget) m_mainWidget);
         */
         XtMapWidget((Widget) m_mainWidget);
         XtManageChild((Widget) m_mainWidget);
         */
         XtMapWidget((Widget) m_mainWidget);

-        return TRUE;
+        return true;

     }
 
     }
 

-    Widget menuBarW = XmCreateMenuBar ((Widget) parent->GetMainWidget(), "MenuBar", NULL, 0);
+    Widget menuBarW = XmCreateMenuBar ((Widget) parent->GetMainWidget(),
+                                       wxMOTIF_STR("MenuBar"), NULL, 0);

     m_mainWidget = (WXWidget) menuBarW;
 
     size_t menuCount = GetMenuCount();
     m_mainWidget = (WXWidget) menuBarW;
 
     size_t menuCount = GetMenuCount();


@@ -386,7 +378,7 @@ bool wxMenuBar::CreateMenuBar(wxFrame* parent)
     {
         wxMenu *menu = GetMenu(i);
         wxString title(m_titles[i]);
     {
         wxMenu *menu = GetMenu(i);
         wxString title(m_titles[i]);

-        menu->SetButtonWidget(menu->CreateMenu (this, menuBarW, menu, title, TRUE));
+        menu->SetButtonWidget(menu->CreateMenu (this, menuBarW, menu, title, true));

 
         if (strcmp (wxStripMenuCodes(title), "Help") == 0)
             XtVaSetValues ((Widget) menuBarW, XmNmenuHelpWidget, (Widget) menu->GetButtonWidget(), NULL);
 
         if (strcmp (wxStripMenuCodes(title), "Help") == 0)
             XtVaSetValues ((Widget) menuBarW, XmNmenuHelpWidget, (Widget) menu->GetButtonWidget(), NULL);


@@ -400,7 +392,7 @@ bool wxMenuBar::CreateMenuBar(wxFrame* parent)
                           NULL);
             Widget tearOff = XmGetTearOffControl(GetWidget(menu));
             wxDoChangeForegroundColour((Widget) tearOff, m_foregroundColour);
                           NULL);
             Widget tearOff = XmGetTearOffControl(GetWidget(menu));
             wxDoChangeForegroundColour((Widget) tearOff, m_foregroundColour);

-            wxDoChangeBackgroundColour((Widget) tearOff, m_backgroundColour, TRUE);
+            wxDoChangeBackgroundColour((Widget) tearOff, m_backgroundColour, true);

 #endif
         }
     }
 #endif
         }
     }


@@ -414,7 +406,7 @@ bool wxMenuBar::CreateMenuBar(wxFrame* parent)
     XtManageChild ((Widget) menuBarW);
     SetMenuBarFrame(parent);
 
     XtManageChild ((Widget) menuBarW);
     SetMenuBarFrame(parent);
 

-    return TRUE;
+    return true;

 }
 
 // Destroy menubar, but keep data structures intact so we can recreate it.
 }
 
 // Destroy menubar, but keep data structures intact so we can recreate it.


@@ -423,7 +415,7 @@ bool wxMenuBar::DestroyMenuBar()
     if (!m_mainWidget)
     {
         SetMenuBarFrame((wxFrame*) NULL);
     if (!m_mainWidget)
     {
         SetMenuBarFrame((wxFrame*) NULL);

-        return FALSE;
+        return false;

     }
 
     XtUnmanageChild ((Widget) m_mainWidget);
     }
 
     XtUnmanageChild ((Widget) m_mainWidget);


@@ -433,7 +425,7 @@ bool wxMenuBar::DestroyMenuBar()
     for (size_t i = 0; i < menuCount; i++)
     {
         wxMenu *menu = GetMenu(i);
     for (size_t i = 0; i < menuCount; i++)
     {
         wxMenu *menu = GetMenu(i);

-        menu->DestroyMenu(TRUE);
+        menu->DestroyMenu(true);

 
     }
     XtDestroyWidget((Widget) m_mainWidget);
 
     }
     XtDestroyWidget((Widget) m_mainWidget);


@@ -441,7 +433,7 @@ bool wxMenuBar::DestroyMenuBar()
 
     SetMenuBarFrame((wxFrame*) NULL);
 
 
     SetMenuBarFrame((wxFrame*) NULL);
 

-    return TRUE;
+    return true;

 }
 
 // Since PopupMenu under Motif stills grab right mouse button events
 }
 
 // Since PopupMenu under Motif stills grab right mouse button events


@@ -469,7 +461,7 @@ void wxMenu::DestroyWidgetAndDetach()
             }
         }
 
             }
         }
 

-        DestroyMenu(TRUE);
+        DestroyMenu(true);

     }
 
     // Mark as no longer popped up
     }
 
     // Mark as no longer popped up


@@ -492,7 +484,7 @@ WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar, WXWidget parent, wxMenu * topM
 
     if (!pullDown)
     {
 
     if (!pullDown)
     {

-        menu = XmCreatePopupMenu ((Widget) parent, "popup", args, 2);
+        menu = XmCreatePopupMenu ((Widget) parent, wxMOTIF_STR("popup"), args, 2);

 #if 0
         XtAddCallback(menu,
             XmNunmapCallback,
 #if 0
         XtAddCallback(menu,
             XmNunmapCallback,


@@ -503,7 +495,7 @@ WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar, WXWidget parent, wxMenu * topM
     else
     {
         char mnem = wxFindMnemonic (title);
     else
     {
         char mnem = wxFindMnemonic (title);

-        menu = XmCreatePulldownMenu ((Widget) parent, "pulldown", args, 2);
+        menu = XmCreatePulldownMenu ((Widget) parent, wxMOTIF_STR("pulldown"), args, 2);

 
         wxString title2(wxStripMenuCodes(title));
         wxXmString label_str(title2);
 
         wxString title2(wxStripMenuCodes(title));
         wxXmString label_str(title2);


@@ -614,7 +606,7 @@ void wxMenu::SetBackgroundColour(const wxColour& col)
     if (m_menuWidget)
         wxDoChangeBackgroundColour(m_menuWidget, (wxColour&) col);
     if (m_buttonWidget)
     if (m_menuWidget)
         wxDoChangeBackgroundColour(m_menuWidget, (wxColour&) col);
     if (m_buttonWidget)

-        wxDoChangeBackgroundColour(m_buttonWidget, (wxColour&) col, TRUE);
+        wxDoChangeBackgroundColour(m_buttonWidget, (wxColour&) col, true);

 
     for ( wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();
           node;
 
     for ( wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();
           node;


@@ -624,7 +616,7 @@ void wxMenu::SetBackgroundColour(const wxColour& col)
         if (item->GetButtonWidget())
         {
             // This crashes because it uses gadgets
         if (item->GetButtonWidget())
         {
             // This crashes because it uses gadgets

-            //            wxDoChangeBackgroundColour(item->GetButtonWidget(), (wxColour&) col, TRUE);
+            //            wxDoChangeBackgroundColour(item->GetButtonWidget(), (wxColour&) col, true);

         }
         if (item->GetSubMenu())
             item->GetSubMenu()->SetBackgroundColour((wxColour&) col);
         }
         if (item->GetSubMenu())
             item->GetSubMenu()->SetBackgroundColour((wxColour&) col);


@@ -656,20 +648,20 @@ void wxMenu::SetForegroundColour(const wxColour& col)
 
 void wxMenu::ChangeFont(bool keepOriginalSize)
 {
 
 void wxMenu::ChangeFont(bool keepOriginalSize)
 {

-    // Lesstif 0.87 hangs here, but 0.93 does not
-#if !wxCHECK_LESSTIF() || wxCHECK_LESSTIF_VERSION( 0, 93 )
+    // Lesstif 0.87 hangs here, but 0.93 does not; MBN: sometimes it does
+#if !wxCHECK_LESSTIF() // || wxCHECK_LESSTIF_VERSION( 0, 93 )

     if (!m_font.Ok() || !m_menuWidget)
         return;
 
     if (!m_font.Ok() || !m_menuWidget)
         return;
 

-    WXFontType fontType = m_font.GetFontType(XtDisplay((Widget) m_menuWidget));
+    Display* dpy = XtDisplay((Widget) m_menuWidget);

 
     XtVaSetValues ((Widget) m_menuWidget,
 
     XtVaSetValues ((Widget) m_menuWidget,

-                   wxFont::GetFontTag(), fontType,
+                   wxFont::GetFontTag(), m_font.GetFontTypeC(dpy),

                    NULL);
     if (m_buttonWidget)
     {
         XtVaSetValues ((Widget) m_buttonWidget,
                    NULL);
     if (m_buttonWidget)
     {
         XtVaSetValues ((Widget) m_buttonWidget,

-                       wxFont::GetFontTag(), fontType,
+                       wxFont::GetFontTag(), m_font.GetFontTypeC(dpy),

                        NULL);
     }
 
                        NULL);
     }
 


@@ -681,7 +673,7 @@ void wxMenu::ChangeFont(bool keepOriginalSize)
         if (m_menuWidget && item->GetButtonWidget() && m_font.Ok())
         {
             XtVaSetValues ((Widget) item->GetButtonWidget(),
         if (m_menuWidget && item->GetButtonWidget() && m_font.Ok())
         {
             XtVaSetValues ((Widget) item->GetButtonWidget(),

-                           wxFont::GetFontTag(), fontType,
+                           wxFont::GetFontTag(), m_font.GetFontTypeC(dpy),

                            NULL);
         }
         if (item->GetSubMenu())
                            NULL);
         }
         if (item->GetSubMenu())


@@ -706,7 +698,7 @@ bool wxMenuBar::SetBackgroundColour(const wxColour& col)
     for (size_t i = 0; i < menuCount; i++)
         m_menus.Item(i)->GetData()->SetBackgroundColour((wxColour&) col);
 
     for (size_t i = 0; i < menuCount; i++)
         m_menus.Item(i)->GetData()->SetBackgroundColour((wxColour&) col);
 

-    return TRUE;
+    return true;

 }
 
 bool wxMenuBar::SetForegroundColour(const wxColour& col)
 }
 
 bool wxMenuBar::SetForegroundColour(const wxColour& col)


@@ -719,7 +711,7 @@ bool wxMenuBar::SetForegroundColour(const wxColour& col)
     for (size_t i = 0; i < menuCount; i++)
         m_menus.Item(i)->GetData()->SetForegroundColour((wxColour&) col);
 
     for (size_t i = 0; i < menuCount; i++)
         m_menus.Item(i)->GetData()->SetForegroundColour((wxColour&) col);
 

-    return TRUE;
+    return true;

 }
 
 void wxMenuBar::ChangeFont(bool WXUNUSED(keepOriginalSize))
 }
 
 void wxMenuBar::ChangeFont(bool WXUNUSED(keepOriginalSize))


@@ -736,6 +728,6 @@ bool wxMenuBar::SetFont(const wxFont& font)
     for (size_t i = 0; i < menuCount; i++)
         m_menus.Item(i)->GetData()->SetFont(font);
 
     for (size_t i = 0; i < menuCount; i++)
         m_menus.Item(i)->GetData()->SetFont(font);
 

-    return TRUE;
+    return true;

 }
 
 }