X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7e1bcfa80e19ac853b8bc7084075fe3b01e63f03..8e1a5bf979fcdf82238b20cda1209a4f67f394c0:/src/motif/menu.cpp diff --git a/src/motif/menu.cpp b/src/motif/menu.cpp index 8a42ba4f1d..d40bdc74bf 100644 --- a/src/motif/menu.cpp +++ b/src/motif/menu.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: menu.cpp +// Name: src/motif/menu.cpp // Purpose: wxMenu, wxMenuBar, wxMenuItem // Author: Julian Smart // Modified by: @@ -9,28 +9,28 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - // ============================================================================ // declarations // ============================================================================ -#ifdef __GNUG__ - #pragma implementation "menu.h" -#endif - // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- -#include "wx/defs.h" +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #include "wx/menu.h" + +#ifndef WX_PRECOMP + #include "wx/log.h" + #include "wx/app.h" + #include "wx/utils.h" + #include "wx/frame.h" + #include "wx/settings.h" +#endif + #include "wx/menuitem.h" -#include "wx/log.h" -#include "wx/utils.h" -#include "wx/app.h" -#include "wx/frame.h" -#include "wx/settings.h" #ifdef __VMS__ #pragma message disable nosimpint @@ -76,11 +76,11 @@ void wxMenu::Init() 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(wxID_SEPARATOR, m_title) ; + Append(-3, m_title) ; AppendSeparator() ; } @@ -95,9 +95,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,44 +114,43 @@ 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); - } - - if ( pItem->IsSubMenu() ) - { - pItem->GetSubMenu()->m_topLevelMenu = m_topLevelMenu; - } - - return wxMenuBase::DoAppend(pItem); + return DoInsert(GetMenuItemCount(), 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; + if (m_menuWidget) + { + // this is a dynamic Append +#ifndef XmNpositionIndex + wxCHECK_MSG( pos == GetMenuItemCount(), -1, wxT("insert not implemented")); +#endif + item->CreateItem(m_menuWidget, GetMenuBar(), m_topLevelMenu, pos); + } - wxFAIL_MSG(wxT("DoInsert not implemented; or error in wxMenuBase::DoInsert")); + if ( item->IsSubMenu() ) + { + item->GetSubMenu()->m_topLevelMenu = m_topLevelMenu; + } - return FALSE; + return pos == GetMenuItemCount() ? wxMenuBase::DoAppend(item) : + wxMenuBase::DoInsert(pos, item); } void wxMenu::SetTitle(const wxString& label) { m_title = label; - wxMenuItemList::Node *node = GetMenuItems().GetFirst(); + wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst(); if ( !node ) return; @@ -168,16 +167,7 @@ void wxMenu::SetTitle(const wxString& label) 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()) @@ -206,11 +196,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( n == titles.GetCount() ); + + Init(); + + m_titles = titles; + for ( size_t 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 ( int i = 0; i < n; i++ ) + for ( size_t i = 0; i < n; i++ ) { m_menus.Append(menus[i]); m_titles.Add(titles[i]); @@ -247,8 +248,6 @@ void wxMenuBar::SetLabelTop(size_t pos, const wxString& label) wxString wxMenuBar::GetLabelTop(size_t pos) const { - wxString str; - wxMenu *menu = GetMenu(pos); if ( menu ) { @@ -260,47 +259,36 @@ wxString wxMenuBar::GetLabelTop(size_t pos) const XmNlabelString, &text, NULL); - char *s; - if ( XmStringGetLtoR(text, XmSTRING_DEFAULT_CHARSET, &s) ) - { - str = s; - - XtFree(s); - } + return wxXmStringToString( text ); } } - return str; + return wxEmptyString; } bool wxMenuBar::Append(wxMenu * menu, const wxString& title) { - wxCHECK_MSG( menu, FALSE, wxT("invalid menu") ); - wxCHECK_MSG( !menu->GetParent() && !menu->GetButtonWidget(), FALSE, + return Insert(GetMenuCount(), menu, title); +} + +bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title) +{ + wxCHECK_MSG( pos <= GetMenuCount(), false, wxT("invalid position") ); + 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, + pos, 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); -} - -bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title) -{ - if ( !wxMenuBarBase::Insert(pos, menu, title) ) - return FALSE; + m_titles.Insert(title, pos); - wxFAIL_MSG(wxT("TODO")); - - return FALSE; + return wxMenuBarBase::Insert(pos, menu, title); } wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title) @@ -320,11 +308,11 @@ wxMenu *wxMenuBar::Remove(size_t pos) return NULL; if ( m_menuBarFrame ) - menu->DestroyMenu(TRUE); + menu->DestroyMenu(true); menu->SetMenuBar(NULL); - m_titles.Remove(pos); + m_titles.RemoveAt(pos); return menu; } @@ -335,14 +323,14 @@ int wxMenuBar::FindMenuItem (const wxString& menuString, const wxString& itemStr { char buf1[200]; char buf2[200]; - wxStripMenuCodes ((char *)(const char *)menuString, buf1); + wxStripMenuCodes (wxConstCast(menuString.c_str(), char), buf1); size_t menuCount = GetMenuCount(); for (size_t i = 0; i < menuCount; i++) { - wxStripMenuCodes ((char *)(const char *)m_titles[i], buf2); + 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; } @@ -352,12 +340,14 @@ wxMenuItem *wxMenuBar::FindItem(int id, wxMenu ** itemMenu) const if (itemMenu) *itemMenu = NULL; - wxMenuItem *item = NULL; size_t menuCount = GetMenuCount(); for (size_t i = 0; i < menuCount; i++) - if ((item = m_menus[i]->FindItem(id, itemMenu))) - return item; - return NULL; + { + wxMenuItem *item = m_menus.Item(i)->GetData()->FindItem(id, itemMenu); + if (item) return item; + } + + return NULL; } // Create menubar @@ -371,10 +361,11 @@ 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); + Widget menuBarW = XmCreateMenuBar ((Widget) parent->GetMainWidget(), + wxMOTIF_STR("MenuBar"), NULL, 0); m_mainWidget = (WXWidget) menuBarW; size_t menuCount = GetMenuCount(); @@ -382,7 +373,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, i, title, true)); if (strcmp (wxStripMenuCodes(title), "Help") == 0) XtVaSetValues ((Widget) menuBarW, XmNmenuHelpWidget, (Widget) menu->GetButtonWidget(), NULL); @@ -396,7 +387,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 } } @@ -410,7 +401,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. @@ -419,7 +410,7 @@ bool wxMenuBar::DestroyMenuBar() if (!m_mainWidget) { SetMenuBarFrame((wxFrame*) NULL); - return FALSE; + return false; } XtUnmanageChild ((Widget) m_mainWidget); @@ -429,7 +420,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); @@ -437,7 +428,7 @@ bool wxMenuBar::DestroyMenuBar() SetMenuBarFrame((wxFrame*) NULL); - return TRUE; + return true; } // Since PopupMenu under Motif stills grab right mouse button events @@ -450,12 +441,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; } @@ -464,7 +456,7 @@ void wxMenu::DestroyWidgetAndDetach() } } - DestroyMenu(TRUE); + DestroyMenu(true); } // Mark as no longer popped up @@ -477,7 +469,12 @@ void wxMenu::DestroyWidgetAndDetach() * */ -WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar, WXWidget parent, wxMenu * topMenu, const wxString& title, bool pullDown) +WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar, + WXWidget parent, + wxMenu * topMenu, + size_t WXUNUSED(index), + const wxString& title, + bool pullDown) { Widget menu = (Widget) 0; Widget buttonWidget = (Widget) 0; @@ -487,7 +484,7 @@ WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar, WXWidget parent, wxMenu * topM if (!pullDown) { - menu = XmCreatePopupMenu ((Widget) parent, "popup", args, 2); + menu = XmCreatePopupMenu ((Widget) parent, wxMOTIF_STR("popup"), args, 2); #if 0 XtAddCallback(menu, XmNunmapCallback, @@ -498,7 +495,7 @@ WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar, WXWidget parent, wxMenu * topM 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); @@ -518,16 +515,16 @@ 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(); + size_t i = 0; + for ( wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst(); node; - node = node->GetNext() ) + node = node->GetNext(), ++i ) { wxMenuItem *item = node->GetData(); - item->CreateItem(menu, menuBar, topMenu); + item->CreateItem(menu, menuBar, topMenu, i); } SetBackgroundColour(m_backgroundColour); @@ -538,11 +535,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() ) { @@ -577,7 +574,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() ) { @@ -610,9 +607,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() ) { @@ -620,7 +617,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); @@ -635,7 +632,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() ) { @@ -652,24 +649,24 @@ void wxMenu::SetForegroundColour(const wxColour& col) void wxMenu::ChangeFont(bool keepOriginalSize) { - // lesstif 0.87 hangs when setting XmNfontList -#ifndef LESSTIF_VERSION + // 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; - XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay((Widget) m_menuWidget)); + Display* dpy = XtDisplay((Widget) m_menuWidget); XtVaSetValues ((Widget) m_menuWidget, - XmNfontList, fontList, - NULL); + wxFont::GetFontTag(), m_font.GetFontTypeC(dpy), + NULL); if (m_buttonWidget) { XtVaSetValues ((Widget) m_buttonWidget, - XmNfontList, fontList, - NULL); + wxFont::GetFontTag(), m_font.GetFontTypeC(dpy), + NULL); } - for ( wxMenuItemList::Node *node = GetMenuItems().GetFirst(); + for ( wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst(); node; node = node->GetNext() ) { @@ -677,12 +674,14 @@ void wxMenu::ChangeFont(bool keepOriginalSize) if (m_menuWidget && item->GetButtonWidget() && m_font.Ok()) { XtVaSetValues ((Widget) item->GetButtonWidget(), - XmNfontList, fontList, - NULL); + wxFont::GetFontTag(), m_font.GetFontTypeC(dpy), + NULL); } if (item->GetSubMenu()) item->GetSubMenu()->ChangeFont(keepOriginalSize); } +#else + wxUnusedVar(keepOriginalSize); #endif } @@ -700,9 +699,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) @@ -713,9 +712,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)) @@ -730,8 +729,7 @@ 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; } -