X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4dff340069297c51f04fcd230282b86eee6943db..86231bdca2c65feb164a1fed2856a9cd08f37fa1:/src/motif/menu.cpp?ds=sidebyside diff --git a/src/motif/menu.cpp b/src/motif/menu.cpp index 964bc73ac8..c2d975ae6e 100644 --- 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,11 @@ // headers // ---------------------------------------------------------------------------- +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#include "wx/defs.h" + #include "wx/menu.h" #include "wx/menuitem.h" #include "wx/log.h" @@ -74,17 +79,17 @@ 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() ; } - m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_MENU); - m_foregroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_MENUTEXT); - m_font = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT); + m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_MENU); + m_foregroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_MENUTEXT); + m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); } // The wxWindow destructor will take care of deleting the submenus. @@ -93,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 @@ -112,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() ) @@ -130,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 FALSE; + if ( wxMenuBase::DoInsert(pos, item) ) + return item; - wxFAIL_MSG(wxT("not implemented")); + 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; @@ -166,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 @@ -199,16 +204,27 @@ void wxMenuBar::Init() m_eventHandler = this; m_menuBarFrame = NULL; m_mainWidget = (WXWidget) NULL; - m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_MENU); - m_foregroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_MENUTEXT); - m_font = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT); + m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_MENU); + m_foregroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_MENUTEXT); + 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]); @@ -245,8 +261,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 ) { @@ -258,34 +272,26 @@ 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, + 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); @@ -294,17 +300,17 @@ 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) { if ( !wxMenuBarBase::Replace(pos, menu, title) ) - return FALSE; + return NULL; wxFAIL_MSG(wxT("TODO")); @@ -318,11 +324,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; } @@ -333,14 +339,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; } @@ -353,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; } @@ -369,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); @@ -380,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); @@ -394,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 } } @@ -408,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. @@ -417,7 +423,7 @@ bool wxMenuBar::DestroyMenuBar() if (!m_mainWidget) { SetMenuBarFrame((wxFrame*) NULL); - return FALSE; + return false; } XtUnmanageChild ((Widget) m_mainWidget); @@ -427,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); @@ -435,33 +441,26 @@ bool wxMenuBar::DestroyMenuBar() SetMenuBarFrame((wxFrame*) NULL); - return TRUE; + return true; } -//// Motif-specific -static XtWorkProcId WorkProcMenuId; - -/* Since PopupMenu under Motif stills grab right mouse button events -* after it was closed, we need to delete the associated widgets to -* allow next PopUpMenu to appear... -*/ - -int PostDeletionOfMenu( XtPointer* clientData ) +// Since PopupMenu under Motif stills grab right mouse button events +// after it was closed, we need to delete the associated widgets to +// allow next PopUpMenu to appear... +void wxMenu::DestroyWidgetAndDetach() { - XtRemoveWorkProc(WorkProcMenuId); - wxMenu *menu = (wxMenu *)clientData; - - if (menu->GetMainWidget()) + if (GetMainWidget()) { - wxMenu *menuParent = menu->GetParent(); + wxMenu *menuParent = GetParent(); if ( menuParent ) { - wxMenuItemList::Node *node = menuParent->GetMenuItems().GetFirst(); + wxMenuItemList::compatibility_iterator node = menuParent->GetMenuItems().GetFirst(); while ( node ) { - if ( node->GetData()->GetSubMenu() == menu ) + if ( node->GetData()->GetSubMenu() == this ) { - menuParent->GetMenuItems().DeleteNode(node); + delete node->GetData(); + menuParent->GetMenuItems().Erase(node); break; } @@ -470,33 +469,11 @@ int PostDeletionOfMenu( XtPointer* clientData ) } } - menu->DestroyMenu(TRUE); + DestroyMenu(true); } // Mark as no longer popped up - menu->m_menuId = -1; - - return TRUE; -} - -void -wxMenuPopdownCallback(Widget WXUNUSED(w), XtPointer clientData, - XtPointer WXUNUSED(ptr)) -{ - wxMenu *menu = (wxMenu *)clientData; - - // Added by JOREL Jean-Charles - /* Since Callbacks of MenuItems are not yet processed, we put a - * background job which will be done when system will be idle. - * What awful hack!! :( - */ - - WorkProcMenuId = XtAppAddWorkProc( - (XtAppContext) wxTheApp->GetAppContext(), - (XtWorkProc) PostDeletionOfMenu, - (XtPointer) menu ); - // Apparently not found in Motif headers - // XtVaSetValues( w, XmNpopupEnabled, XmPOPUP_DISABLED, NULL ); + m_menuId = -1; } /* @@ -511,21 +488,21 @@ WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar, WXWidget parent, wxMenu * topM 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) { menu = XmCreatePopupMenu ((Widget) parent, "popup", args, 2); +#if 0 XtAddCallback(menu, XmNunmapCallback, (XtCallbackProc)wxMenuPopdownCallback, (XtPointer)this); +#endif } else { char mnem = wxFindMnemonic (title); - wxStripMenuCodes ((char*) (const char*) title, wxBuffer); - menu = XmCreatePulldownMenu ((Widget) parent, "pulldown", args, 2); wxString title2(wxStripMenuCodes(title)); @@ -546,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() ) { @@ -566,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() ) { @@ -605,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() ) { @@ -638,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() ) { @@ -648,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); @@ -663,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() ) { @@ -680,24 +656,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 +#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)); + WXFontType fontType = m_font.GetFontType(XtDisplay((Widget) m_menuWidget)); XtVaSetValues ((Widget) m_menuWidget, - XmNfontList, fontList, - NULL); + wxFont::GetFontTag(), fontType, + NULL); if (m_buttonWidget) { XtVaSetValues ((Widget) m_buttonWidget, - XmNfontList, fontList, - NULL); + wxFont::GetFontTag(), fontType, + NULL); } - for ( wxMenuItemList::Node *node = GetMenuItems().GetFirst(); + for ( wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst(); node; node = node->GetNext() ) { @@ -705,8 +681,8 @@ void wxMenu::ChangeFont(bool keepOriginalSize) if (m_menuWidget && item->GetButtonWidget() && m_font.Ok()) { XtVaSetValues ((Widget) item->GetButtonWidget(), - XmNfontList, fontList, - NULL); + wxFont::GetFontTag(), fontType, + NULL); } if (item->GetSubMenu()) item->GetSubMenu()->ChangeFont(keepOriginalSize); @@ -728,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) @@ -741,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)) @@ -758,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; }