X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4224f059750329cc68964eeb7b2633206e245e0d..05b282a014da3e731c3b5dfc926633e3283538c7:/src/motif/menu.cpp?ds=sidebyside

diff --git a/src/motif/menu.cpp b/src/motif/menu.cpp
index 2b2113f171..c2d975ae6e 100644
--- a/src/motif/menu.cpp
+++ b/src/motif/menu.cpp
@@ -22,6 +22,9 @@
 // headers
 // ----------------------------------------------------------------------------
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
 #include "wx/defs.h"
 
 #include "wx/menu.h"
@@ -76,11 +79,11 @@ void wxMenu::Init()
     m_buttonWidget = (WXWidget) NULL;
     m_menuId = 0;
     m_topLevelMenu  = (wxMenu*) NULL;
-    m_ownedByMenuBar = FALSE;
+    m_ownedByMenuBar = false;
 
     if ( !!m_title )
     {
-        Append(wxID_SEPARATOR, m_title) ;
+        Append(-3, m_title) ;
         AppendSeparator() ;
     }
 
@@ -95,9 +98,9 @@ wxMenu::~wxMenu()
     if (m_menuWidget)
     {
         if (m_menuParent)
-            DestroyMenu(TRUE);
+            DestroyMenu(true);
         else
-            DestroyMenu(FALSE);
+            DestroyMenu(false);
     }
 
     // Not sure if this is right
@@ -132,7 +135,7 @@ wxMenuItem* wxMenu::DoAppend(wxMenuItem *pItem)
 
 wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
 {
-    item->DestroyItem(TRUE);
+    item->DestroyItem(true);
 
     return wxMenuBase::DoRemove(item);
 }
@@ -168,14 +171,14 @@ void wxMenu::SetTitle(const wxString& label)
 
 bool wxMenu::ProcessCommand(wxCommandEvent & event)
 {
-    bool processed = FALSE;
+    bool processed = false;
 
 #if wxUSE_MENU_CALLBACK
     // Try a callback
     if (m_callback)
     {
         (void) (*(m_callback)) (*this, event);
-        processed = TRUE;
+        processed = true;
     }
 #endif // wxUSE_MENU_CALLBACK
 
@@ -206,7 +209,7 @@ void wxMenuBar::Init()
     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() );
 
@@ -217,11 +220,11 @@ wxMenuBar::wxMenuBar(int n, wxMenu *menus[], const wxArrayString& titles)
         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();
 
-    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]);
@@ -278,14 +281,14 @@ wxString wxMenuBar::GetLabelTop(size_t pos) const
 
 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 )
     {
-        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);
     }
 
@@ -297,11 +300,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) )
-        return FALSE;
+        return false;
 
     wxFAIL_MSG(wxT("TODO"));
 
-    return FALSE;
+    return false;
 }
 
 wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
@@ -321,7 +324,7 @@ wxMenu *wxMenuBar::Remove(size_t pos)
         return NULL;
 
     if ( m_menuBarFrame )
-        menu->DestroyMenu(TRUE);
+        menu->DestroyMenu(true);
 
     menu->SetMenuBar(NULL);
 
@@ -372,7 +375,7 @@ bool wxMenuBar::CreateMenuBar(wxFrame* parent)
         XtManageChild((Widget) m_mainWidget);
         */
         XtMapWidget((Widget) m_mainWidget);
-        return TRUE;
+        return true;
     }
 
     Widget menuBarW = XmCreateMenuBar ((Widget) parent->GetMainWidget(), "MenuBar", NULL, 0);
@@ -383,7 +386,7 @@ bool wxMenuBar::CreateMenuBar(wxFrame* parent)
     {
         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);
@@ -397,7 +400,7 @@ bool wxMenuBar::CreateMenuBar(wxFrame* parent)
                           NULL);
             Widget tearOff = XmGetTearOffControl(GetWidget(menu));
             wxDoChangeForegroundColour((Widget) tearOff, m_foregroundColour);
-            wxDoChangeBackgroundColour((Widget) tearOff, m_backgroundColour, TRUE);
+            wxDoChangeBackgroundColour((Widget) tearOff, m_backgroundColour, true);
 #endif
         }
     }
@@ -411,7 +414,7 @@ bool wxMenuBar::CreateMenuBar(wxFrame* parent)
     XtManageChild ((Widget) menuBarW);
     SetMenuBarFrame(parent);
 
-    return TRUE;
+    return true;
 }
 
 // Destroy menubar, but keep data structures intact so we can recreate it.
@@ -420,7 +423,7 @@ bool wxMenuBar::DestroyMenuBar()
     if (!m_mainWidget)
     {
         SetMenuBarFrame((wxFrame*) NULL);
-        return FALSE;
+        return false;
     }
 
     XtUnmanageChild ((Widget) m_mainWidget);
@@ -430,7 +433,7 @@ bool wxMenuBar::DestroyMenuBar()
     for (size_t i = 0; i < menuCount; i++)
     {
         wxMenu *menu = GetMenu(i);
-        menu->DestroyMenu(TRUE);
+        menu->DestroyMenu(true);
 
     }
     XtDestroyWidget((Widget) m_mainWidget);
@@ -438,7 +441,7 @@ bool wxMenuBar::DestroyMenuBar()
 
     SetMenuBarFrame((wxFrame*) NULL);
 
-    return TRUE;
+    return true;
 }
 
 // Since PopupMenu under Motif stills grab right mouse button events
@@ -466,7 +469,7 @@ void wxMenu::DestroyWidgetAndDetach()
             }
         }
 
-        DestroyMenu(TRUE);
+        DestroyMenu(true);
     }
 
     // Mark as no longer popped up
@@ -539,7 +542,7 @@ WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar, WXWidget parent, wxMenu * topM
 }
 
 // Destroys the Motif implementation of the menu,
-// but maintains the wxWindows data structures so we can
+// but maintains the wxWidgets data structures so we can
 // do a CreateMenu again.
 void wxMenu::DestroyMenu (bool full)
 {
@@ -611,7 +614,7 @@ void wxMenu::SetBackgroundColour(const wxColour& col)
     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;
@@ -621,7 +624,7 @@ void wxMenu::SetBackgroundColour(const wxColour& col)
         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);
@@ -703,7 +706,7 @@ bool wxMenuBar::SetBackgroundColour(const 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)
@@ -716,7 +719,7 @@ bool wxMenuBar::SetForegroundColour(const 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))
@@ -733,6 +736,6 @@ bool wxMenuBar::SetFont(const wxFont& font)
     for (size_t i = 0; i < menuCount; i++)
         m_menus.Item(i)->GetData()->SetFont(font);
 
-    return TRUE;
+    return true;
 }