VC++-generated apparently harmless change

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

diff --git a/src/motif/menu.cpp b/src/motif/menu.cpp
index 8699350bbb503fc63afd5efca75cdcd8e7e66e64..c2d975ae6e7c0b3f5be3e0c3700d1d716574dc7e 100644 (file)
--- a/src/motif/menu.cpp
+++ b/src/motif/menu.cpp
@@ -14,7 +14,7 @@
 // declarations
 // ============================================================================
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "menu.h"
 #endif
 
@@ -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
@@ -114,12 +117,12 @@ void wxMenu::Break()
 }
 
 // function appends a new item or submenu to the menu
-bool wxMenu::DoAppend(wxMenuItem *pItem)
+wxMenuItem* wxMenu::DoAppend(wxMenuItem *pItem)
 {
     if (m_menuWidget)
     {
         // this is a dynamic Append
-        pItem->CreateItem(m_menuWidget, m_menuBar, m_topLevelMenu);
+        pItem->CreateItem(m_menuWidget, GetMenuBar(), m_topLevelMenu);
     }
 
     if ( pItem->IsSubMenu() )
@@ -132,26 +135,26 @@ bool wxMenu::DoAppend(wxMenuItem *pItem)
 
 wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
 {
-    item->DestroyItem(TRUE);
+    item->DestroyItem(true);
 
     return wxMenuBase::DoRemove(item);
 }
 
-bool wxMenu::DoInsert(size_t pos, wxMenuItem *item)
+wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item)
 {
     if ( wxMenuBase::DoInsert(pos, item) )
-        return TRUE;
+        return item;
 
     wxFAIL_MSG(wxT("DoInsert not implemented; or error in wxMenuBase::DoInsert"));
 
-    return FALSE;
+    return NULL;
 }
 
 void wxMenu::SetTitle(const wxString& label)
 {
     m_title = label;
 
-    wxMenuItemList::Node *node = GetMenuItems().GetFirst();
+    wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();
     if ( !node )
         return;
 
@@ -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,11 +209,22 @@ void wxMenuBar::Init()
     m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
 }
 
-wxMenuBar::wxMenuBar(int n, wxMenu *menus[], const wxString titles[])
+wxMenuBar::wxMenuBar(size_t n, wxMenu *menus[], const wxArrayString& titles, long WXUNUSED(style))
 {
+    wxASSERT( size_t(n) == titles.GetCount() );
+
     Init();
 
+    m_titles = titles;
     for ( int i = 0; i < n; i++ )
+        m_menus.Append(menus[i]);
+}
+
+wxMenuBar::wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long WXUNUSED(style))
+{
+    Init();
+
+    for ( size_t i = 0; i < n; i++ )
     {
         m_menus.Append(menus[i]);
         m_titles.Add(titles[i]);
@@ -267,19 +281,17 @@ 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);
     }
 
-    //menu->SetMenuBar(this);
-
     m_titles.Add(title);
 
     return wxMenuBarBase::Append(menu, title);
@@ -288,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)
@@ -312,7 +324,7 @@ wxMenu *wxMenuBar::Remove(size_t pos)
         return NULL;
 
     if ( m_menuBarFrame )
-        menu->DestroyMenu(TRUE);
+        menu->DestroyMenu(true);
 
     menu->SetMenuBar(NULL);
 
@@ -334,7 +346,7 @@ int wxMenuBar::FindMenuItem (const wxString& menuString, const wxString& itemStr
     {
         wxStripMenuCodes (wxConstCast(m_titles[i].c_str(), char), buf2);
         if (strcmp (buf1, buf2) == 0)
-            return m_menus[i]->FindItem (itemString);
+            return m_menus.Item(i)->GetData()->FindItem (itemString);
     }
     return -1;
 }
@@ -347,7 +359,7 @@ wxMenuItem *wxMenuBar::FindItem(int id, wxMenu ** itemMenu) const
     wxMenuItem *item = NULL;
     size_t menuCount = GetMenuCount();
     for (size_t i = 0; i < menuCount; i++)
-        if ((item = m_menus[i]->FindItem(id, itemMenu)))
+        if ((item = m_menus.Item(i)->GetData()->FindItem(id, itemMenu)))
             return item;
         return NULL;
 }
@@ -363,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);
@@ -374,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);
@@ -388,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
         }
     }
@@ -402,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.
@@ -411,7 +423,7 @@ bool wxMenuBar::DestroyMenuBar()
     if (!m_mainWidget)
     {
         SetMenuBarFrame((wxFrame*) NULL);
-        return FALSE;
+        return false;
     }
 
     XtUnmanageChild ((Widget) m_mainWidget);
@@ -421,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);
@@ -429,7 +441,7 @@ bool wxMenuBar::DestroyMenuBar()
 
     SetMenuBarFrame((wxFrame*) NULL);
 
-    return TRUE;
+    return true;
 }
 
 // Since PopupMenu under Motif stills grab right mouse button events
@@ -442,12 +454,13 @@ void wxMenu::DestroyWidgetAndDetach()
         wxMenu *menuParent = GetParent();
         if ( menuParent )
         {
-            wxMenuItemList::Node *node = menuParent->GetMenuItems().GetFirst();
+            wxMenuItemList::compatibility_iterator node = menuParent->GetMenuItems().GetFirst();
             while ( node )
             {
                 if ( node->GetData()->GetSubMenu() == this )
                 {
-                    menuParent->GetMenuItems().DeleteNode(node);
+                    delete node->GetData();
+                    menuParent->GetMenuItems().Erase(node);
 
                     break;
                 }
@@ -456,7 +469,7 @@ void wxMenu::DestroyWidgetAndDetach()
             }
         }
 
-        DestroyMenu(TRUE);
+        DestroyMenu(true);
     }
 
     // Mark as no longer popped up
@@ -510,10 +523,9 @@ WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar, WXWidget parent, wxMenu * topM
 
     m_menuWidget = (WXWidget) menu;
 
-    m_menuBar = menuBar;
     m_topLevelMenu = topMenu;
 
-    for ( wxMenuItemList::Node *node = GetMenuItems().GetFirst();
+    for ( wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();
           node;
           node = node->GetNext() )
     {
@@ -530,11 +542,11 @@ 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)
 {
-    for ( wxMenuItemList::Node *node = GetMenuItems().GetFirst();
+    for ( wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();
           node;
           node = node->GetNext() )
     {
@@ -569,7 +581,7 @@ WXWidget wxMenu::FindMenuItem (int id, wxMenuItem ** it) const
         return m_buttonWidget;
     }
 
-    for ( wxMenuItemList::Node *node = GetMenuItems().GetFirst();
+    for ( wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();
           node;
           node = node->GetNext() )
     {
@@ -602,9 +614,9 @@ 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::Node *node = GetMenuItems().GetFirst();
+    for ( wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();
           node;
           node = node->GetNext() )
     {
@@ -612,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);
@@ -627,7 +639,7 @@ void wxMenu::SetForegroundColour(const wxColour& col)
     if (m_buttonWidget)
         wxDoChangeForegroundColour(m_buttonWidget, (wxColour&) col);
 
-    for ( wxMenuItemList::Node *node = GetMenuItems().GetFirst();
+    for ( wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();
           node;
           node = node->GetNext() )
     {
@@ -661,7 +673,7 @@ void wxMenu::ChangeFont(bool keepOriginalSize)
                        NULL);
     }
 
-    for ( wxMenuItemList::Node *node = GetMenuItems().GetFirst();
+    for ( wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();
           node;
           node = node->GetNext() )
     {
@@ -692,9 +704,9 @@ bool wxMenuBar::SetBackgroundColour(const wxColour& col)
 
     size_t menuCount = GetMenuCount();
     for (size_t i = 0; i < menuCount; i++)
-        m_menus[i]->SetBackgroundColour((wxColour&) col);
+        m_menus.Item(i)->GetData()->SetBackgroundColour((wxColour&) col);
 
-    return TRUE;
+    return true;
 }
 
 bool wxMenuBar::SetForegroundColour(const wxColour& col)
@@ -705,9 +717,9 @@ bool wxMenuBar::SetForegroundColour(const wxColour& col)
 
     size_t menuCount = GetMenuCount();
     for (size_t i = 0; i < menuCount; i++)
-        m_menus[i]->SetForegroundColour((wxColour&) col);
+        m_menus.Item(i)->GetData()->SetForegroundColour((wxColour&) col);
 
-    return TRUE;
+    return true;
 }
 
 void wxMenuBar::ChangeFont(bool WXUNUSED(keepOriginalSize))
@@ -722,8 +734,8 @@ bool wxMenuBar::SetFont(const wxFont& font)
 
     size_t menuCount = GetMenuCount();
     for (size_t i = 0; i < menuCount; i++)
-        m_menus[i]->SetFont(font);
+        m_menus.Item(i)->GetData()->SetFont(font);
 
-    return TRUE;
+    return true;
 }