X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cba2db0c2969f9b83e8a1736e260d22200e99a99..64ea838d8f4d1853b7d850db93ee565e901d099a:/src/motif/menu.cpp diff --git a/src/motif/menu.cpp b/src/motif/menu.cpp index b940cce133..02ada167a3 100644 --- a/src/motif/menu.cpp +++ b/src/motif/menu.cpp @@ -1,35 +1,39 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: menu.cpp +// Name: src/motif/menu.cpp // Purpose: wxMenu, wxMenuBar, wxMenuItem // Author: Julian Smart // Modified by: // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - // ============================================================================ -// headers & declarations +// declarations // ============================================================================ -// wxWindows headers -// ----------------- +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- -#ifdef __GNUG__ -#pragma implementation "menu.h" -#pragma implementation "menuitem.h" -#endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #include "wx/menu.h" -#include "wx/menuitem.h" -#include "wx/log.h" -#include "wx/utils.h" -#include "wx/app.h" -#include "wx/frame.h" -#include "wx/settings.h" +#ifndef WX_PRECOMP + #include "wx/log.h" + #include "wx/app.h" + #include "wx/utils.h" + #include "wx/frame.h" + #include "wx/settings.h" + #include "wx/menuitem.h" +#endif + +#ifdef __VMS__ +#pragma message disable nosimpint +#endif #include #include #include @@ -39,55 +43,40 @@ #include #include #include +#ifdef __VMS__ +#pragma message enable nosimpint +#endif #include "wx/motif/private.h" // other standard headers -// ---------------------- #include -#if !USE_SHARED_LIBRARY -IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler) -IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler) -#endif - // ============================================================================ // implementation // ============================================================================ +// ---------------------------------------------------------------------------- // Menus +// ---------------------------------------------------------------------------- // Construct a menu with optional title (then use append) -wxMenu::wxMenu(const wxString& title, const wxFunction func) +void wxMenu::Init() { - m_title = title; - m_parent = (wxEvtHandler*) NULL; - m_eventHandler = this; - m_noItems = 0; - m_menuBar = NULL; - m_pInvokingWindow = NULL; - - //// Motif-specific members + // Motif-specific members m_numColumns = 1; m_menuWidget = (WXWidget) NULL; m_popupShell = (WXWidget) NULL; m_buttonWidget = (WXWidget) NULL; m_menuId = 0; - m_topLevelMenu = (wxMenu*) NULL; - m_ownedByMenuBar = FALSE; - m_menuParent = (wxMenu*) NULL; - m_clientData = (void*) NULL; - - if (m_title != "") + m_topLevelMenu = NULL; + m_ownedByMenuBar = false; + + if ( !m_title.empty() ) { - Append(ID_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); - - Callback(func); } // The wxWindow destructor will take care of deleting the submenus. @@ -96,767 +85,294 @@ wxMenu::~wxMenu() if (m_menuWidget) { if (m_menuParent) - DestroyMenu(TRUE); + DestroyMenu(true); else - DestroyMenu(FALSE); + DestroyMenu(false); } - + // Not sure if this is right if (m_menuParent && m_menuBar) { m_menuParent = NULL; // m_menuBar = NULL; } - - wxNode *node = m_menuItems.First(); - while (node) - { - wxMenuItem *item = (wxMenuItem *)node->Data(); - - /* - if (item->GetSubMenu()) - item->DeleteSubMenu(); - */ - - wxNode *next = node->Next(); - delete item; - delete node; - node = next; - } } void wxMenu::Break() { - m_numColumns ++; + m_numColumns++; } // function appends a new item or submenu to the menu -void wxMenu::Append(wxMenuItem *pItem) +wxMenuItem* wxMenu::DoAppend(wxMenuItem *pItem) { - wxCHECK_RET( pItem != NULL, "can't append NULL item to the menu" ); - - m_menuItems.Append(pItem); - - if (m_menuWidget) - pItem->CreateItem (m_menuWidget, m_menuBar, m_topLevelMenu); // this is a dynamic Append - - m_noItems++; -} - -void wxMenu::AppendSeparator() -{ - Append(new wxMenuItem(this, ID_SEPARATOR)); + return DoInsert(GetMenuItemCount(), pItem); } -// Pullright item -// N.B.: difference between old and new code. -// Old code stores subMenu in 'children' for later deletion, -// as well as in m_menuItems, whereas we only store it in -// m_menuItems here. What implications does this have? - -void wxMenu::Append(int id, const wxString& label, wxMenu *subMenu, - const wxString& helpString) +wxMenuItem *wxMenu::DoRemove(wxMenuItem *item) { - Append(new wxMenuItem(this, id, label, helpString, FALSE, subMenu)); - - subMenu->m_topLevelMenu = m_topLevelMenu; -} + item->DestroyItem(true); -// Ordinary menu item -void wxMenu::Append(int id, const wxString& label, - const wxString& helpString, bool checkable) -{ - // 'checkable' parameter is useless for Windows. - Append(new wxMenuItem(this, id, label, helpString, checkable)); + return wxMenuBase::DoRemove(item); } -void wxMenu::Delete(int id) +wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item) { - wxNode *node; - wxMenuItem *item; - int pos; - - for (pos = 0, node = m_menuItems.First(); node; node = node->Next(), pos++) + if (m_menuWidget) { - item = (wxMenuItem *)node->Data(); - if (item->GetId() == id) - break; - } - - if (!node) - return; - - item->DestroyItem(TRUE); - - // See also old code - don't know if this is needed (seems redundant). - /* - if (item->GetSubMenu()) { - item->subMenu->top_level_menu = item->GetSubMenu(); - item->subMenu->window_parent = NULL; - children->DeleteObject(item->GetSubMenu()); + // 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); } - */ - - m_menuItems.DeleteNode(node); - delete item; -} - -void wxMenu::Enable(int id, bool flag) -{ - wxMenuItem *item = FindItemForId(id); - wxCHECK_RET( item != NULL, "can't enable non-existing menu item" ); - - item->Enable(flag); -} - -bool wxMenu::Enabled(int Id) const -{ - wxMenuItem *item = FindItemForId(Id); - wxCHECK( item != NULL, FALSE ); - - return item->IsEnabled(); -} -void wxMenu::Check(int Id, bool Flag) -{ - wxMenuItem *item = FindItemForId(Id); - wxCHECK_RET( item != NULL, "can't get status of non-existing menu item" ); - - item->Check(Flag); -} + if ( item->IsSubMenu() ) + { + item->GetSubMenu()->m_topLevelMenu = m_topLevelMenu; + } -bool wxMenu::Checked(int id) const -{ - wxMenuItem *item = FindItemForId(id); - wxCHECK( item != NULL, FALSE ); - - return item->IsChecked(); + return pos == GetMenuItemCount() ? wxMenuBase::DoAppend(item) : + wxMenuBase::DoInsert(pos, item); } void wxMenu::SetTitle(const wxString& label) { - m_title = label ; - - wxNode *node = m_menuItems.First (); - if (!node) - return; - - wxMenuItem *item = (wxMenuItem *) node->Data (); - Widget widget = (Widget) item->GetButtonWidget(); - if (!widget) - return; - - XmString title_str = XmStringCreateSimple ((char*) (const char*) label); - XtVaSetValues (widget, - XmNlabelString, title_str, - NULL); - // TODO: should we delete title_str now? -} - -const wxString wxMenu::GetTitle() const -{ - return m_title; -} + m_title = label; -void wxMenu::SetLabel(int id, const wxString& label) -{ - wxMenuItem *item = FindItemForId(id); - if (item == (wxMenuItem*) NULL) + wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst(); + if ( !node ) return; - - item->SetLabel(label); -} - -wxString wxMenu::GetLabel(int id) const -{ - wxMenuItem *it = NULL; - WXWidget w = FindMenuItem (id, &it); - if (w) - { - XmString text; - char *s; - XtVaGetValues ((Widget) w, - XmNlabelString, &text, - NULL); - - if (XmStringGetLtoR (text, XmSTRING_DEFAULT_CHARSET, &s)) - { - wxString str(s); - XtFree (s); - return str; - } - else - { - XmStringFree (text); - return wxEmptyString; - } - } - else - return wxEmptyString; -} -// Finds the item id matching the given string, -1 if not found. -int wxMenu::FindItem (const wxString& itemString) const -{ - char buf1[200]; - char buf2[200]; - wxStripMenuCodes ((char *)(const char *)itemString, buf1); - - for (wxNode * node = m_menuItems.First (); node; node = node->Next ()) - { - wxMenuItem *item = (wxMenuItem *) node->Data (); - if (item->GetSubMenu()) - { - int ans = item->GetSubMenu()->FindItem(itemString); - if (ans > -1) - return ans; - } - if ( !item->IsSeparator() ) - { - wxStripMenuCodes((char *)item->GetName().c_str(), buf2); - if (strcmp(buf1, buf2) == 0) - return item->GetId(); - } - } - - return -1; -} - -wxMenuItem *wxMenu::FindItemForId(int itemId, wxMenu ** itemMenu) const -{ - if (itemMenu) - *itemMenu = NULL; - for (wxNode * node = m_menuItems.First (); node; node = node->Next ()) - { - wxMenuItem *item = (wxMenuItem *) node->Data (); - - if (item->GetId() == itemId) - { - if (itemMenu) - *itemMenu = (wxMenu *) this; - return item; - } - - if (item->GetSubMenu()) - { - wxMenuItem *ans = item->GetSubMenu()->FindItemForId (itemId, itemMenu); - if (ans) - return ans; - } - } - - if (itemMenu) - *itemMenu = NULL; - return NULL; -} + wxMenuItem *item = node->GetData (); + Widget widget = (Widget) item->GetButtonWidget(); + if ( !widget ) + return; -void wxMenu::SetHelpString(int itemId, const wxString& helpString) -{ - wxMenuItem *item = FindItemForId (itemId); - if (item) - item->SetHelp(helpString); + wxXmString title_str(label); + XtVaSetValues(widget, + XmNlabelString, title_str(), + NULL); } -wxString wxMenu::GetHelpString (int itemId) const +bool wxMenu::ProcessCommand(wxCommandEvent & event) { - wxMenuItem *item = FindItemForId (itemId); - wxString str(""); - return (item == NULL) ? str : item->GetHelp(); -} + // Try the menu's event handler first + wxEvtHandler * const handler = GetEventHandler(); + bool processed = handler ? handler->SafelyProcessEvent(event) : false; -void wxMenu::ProcessCommand(wxCommandEvent & event) -{ - bool processed = FALSE; - - // Try a callback - if (m_callback) - { - (void) (*(m_callback)) (*this, event); - processed = TRUE; - } - - // Try the menu's event handler - if ( !processed && GetEventHandler()) - { - processed = GetEventHandler()->ProcessEvent(event); - } // Try the window the menu was popped up from (and up // through the hierarchy) if ( !processed && GetInvokingWindow()) - processed = GetInvokingWindow()->ProcessEvent(event); -} + processed = GetInvokingWindow()->HandleWindowEvent(event); -// Update a menu and all submenus recursively. -// source is the object that has the update event handlers -// defined for it. If NULL, the menu or associated window -// will be used. -void wxMenu::UpdateUI(wxEvtHandler* source) -{ - if (!source && GetInvokingWindow()) - source = GetInvokingWindow()->GetEventHandler(); - if (!source) - source = GetEventHandler(); - if (!source) - source = this; - - wxNode* node = GetItems().First(); - while (node) - { - wxMenuItem* item = (wxMenuItem*) node->Data(); - if ( !item->IsSeparator() ) - { - wxWindowID id = item->GetId(); - wxUpdateUIEvent event(id); - event.SetEventObject( source ); - - if (source->ProcessEvent(event)) - { - if (event.GetSetText()) - SetLabel(id, event.GetText()); - if (event.GetSetChecked()) - Check(id, event.GetChecked()); - if (event.GetSetEnabled()) - Enable(id, event.GetEnabled()); - } - - if (item->GetSubMenu()) - item->GetSubMenu()->UpdateUI(source); - } - node = node->Next(); - } -} - -bool wxWindow::PopupMenu(wxMenu *menu, int x, int y) -{ - Widget widget = (Widget) GetMainWidget(); - - /* The menuId field seems to be usused, so we'll use it to - indicate whether a menu is popped up or not: - 0: Not currently created as a popup - -1: Created as a popup, but not active - 1: Active popup. - */ - - if (menu->GetParent() && (menu->GetId() != -1)) - return FALSE; - - if (menu->GetMainWidget()) { - menu->DestroyMenu(TRUE); - } - - wxWindow *parent = this; - - menu->SetId(1); /* Mark as popped-up */ - menu->CreateMenu(NULL, widget, menu); - menu->SetInvokingWindow(this); - - menu->UpdateUI(); - - // menu->SetParent(parent); - // parent->children->Append(menu); // Store menu for later deletion - - Widget menuWidget = (Widget) menu->GetMainWidget(); - - int rootX = 0; - int rootY = 0; - - int deviceX = x; - int deviceY = y; - /* - if (this->IsKindOf(CLASSINFO(wxCanvas))) - { - wxCanvas *canvas = (wxCanvas *) this; - deviceX = canvas->GetDC ()->LogicalToDeviceX (x); - deviceY = canvas->GetDC ()->LogicalToDeviceY (y); - } - */ - - Display *display = XtDisplay (widget); - Window rootWindow = RootWindowOfScreen (XtScreen((Widget)widget)); - Window thisWindow = XtWindow (widget); - Window childWindow; - XTranslateCoordinates (display, thisWindow, rootWindow, (int) deviceX, (int) deviceY, - &rootX, &rootY, &childWindow); - - XButtonPressedEvent event; - event.type = ButtonPress; - event.button = 1; - - event.x = deviceX; - event.y = deviceY; - - event.x_root = rootX; - event.y_root = rootY; - - XmMenuPosition (menuWidget, &event); - XtManageChild (menuWidget); - - return TRUE; + return processed; } +// ---------------------------------------------------------------------------- // Menu Bar -wxMenuBar::wxMenuBar() -{ - m_eventHandler = this; - m_menuCount = 0; - m_menus = NULL; - m_titles = NULL; - 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); -} +// ---------------------------------------------------------------------------- -wxMenuBar::wxMenuBar(long WXUNUSED(style)) +void wxMenuBar::Init() { m_eventHandler = this; - m_menuCount = 0; - m_menus = NULL; - m_titles = NULL; 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); } -wxMenuBar::wxMenuBar(int n, wxMenu *menus[], const wxString titles[]) +wxMenuBar::wxMenuBar(size_t n, wxMenu *menus[], const wxArrayString& titles, long WXUNUSED(style)) { - m_eventHandler = this; - m_menuCount = n; - m_menus = menus; - m_titles = new wxString[n]; - int i; - for ( i = 0; i < n; i++ ) - m_titles[i] = titles[i]; - m_menuBarFrame = NULL; - m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_MENU); - m_foregroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_MENUTEXT); - m_font = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT); + wxASSERT( n == titles.GetCount() ); + + Init(); + + m_titles = titles; + for ( size_t i = 0; i < n; i++ ) + m_menus.Append(menus[i]); } -wxMenuBar::~wxMenuBar() +wxMenuBar::wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long WXUNUSED(style)) { - int i; - for (i = 0; i < m_menuCount; i++) + Init(); + + for ( size_t i = 0; i < n; i++ ) { - delete m_menus[i]; + m_menus.Append(menus[i]); + m_titles.Add(titles[i]); } - delete[] m_menus; - delete[] m_titles; } -// Must only be used AFTER menu has been attached to frame, -// otherwise use individual menus to enable/disable items -void wxMenuBar::Enable(int id, bool flag) +wxMenuBar::~wxMenuBar() { - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(id, &itemMenu) ; - if (!item) - return; - item->Enable(flag); + // nothing to do: wxMenuBarBase will delete the menus } -void wxMenuBar::EnableTop(int pos, bool flag) +void wxMenuBar::EnableTop(size_t WXUNUSED(pos), bool WXUNUSED(flag)) { - // TODO + // wxFAIL_MSG("TODO"); +// wxLogWarning("wxMenuBar::EnableTop not yet implemented."); } -// Must only be used AFTER menu has been attached to frame, -// otherwise use individual menus -void wxMenuBar::Check(int id, bool flag) +void wxMenuBar::SetMenuLabel(size_t pos, const wxString& label) { - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(id, &itemMenu) ; - if (!item) + wxMenu *menu = GetMenu(pos); + if ( !menu ) return; - - if (!item->IsCheckable()) - return ; - - item->Check(flag); -} -bool wxMenuBar::Checked(int id) const -{ - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(id, &itemMenu) ; - if (!item) - return FALSE; - - return item->IsChecked(); -} + Widget w = (Widget)menu->GetButtonWidget(); + if (w) + { + wxXmString label_str(label); -bool wxMenuBar::Enabled(int id) const -{ - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(id, &itemMenu) ; - if (!item) - return FALSE; - - return item->IsEnabled(); + XtVaSetValues(w, + XmNlabelString, label_str(), + NULL); + } + m_titles[pos] = label; } -void wxMenuBar::SetLabel(int id, const wxString& label) +wxString wxMenuBar::GetMenuLabel(size_t pos) const { - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(id, &itemMenu) ; - - if (!item) - return; - - item->SetLabel(label); + wxCHECK_MSG( pos < GetMenuCount(), wxEmptyString, + wxT("invalid menu index in wxMenuBar::GetMenuLabel") ); + return m_titles[pos]; } -wxString wxMenuBar::GetLabel(int id) const +bool wxMenuBar::Append(wxMenu * menu, const wxString& title) { - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(id, &itemMenu) ; - - if (!item) - return wxString(""); - - return item->GetLabel(); + return Insert(GetMenuCount(), menu, title); } -void wxMenuBar::SetLabelTop(int pos, const wxString& label) +bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title) { - wxASSERT( (pos < m_menuCount) ); - - Widget w = (Widget) m_menus[pos]->GetButtonWidget(); - if (w) - { - XmString label_str = XmStringCreateSimple ((char*) (const char*) label); - XtVaSetValues (w, - XmNlabelString, label_str, - NULL); - XmStringFree (label_str); - } -} + 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") ); -wxString wxMenuBar::GetLabelTop(int pos) const -{ - wxASSERT( (pos < m_menuCount) ); - - Widget w = (Widget) m_menus[pos]->GetButtonWidget(); - if (w) + if ( m_menuBarFrame ) { - XmString text; - char *s; - XtVaGetValues (w, - XmNlabelString, &text, - NULL); - - if (XmStringGetLtoR (text, XmSTRING_DEFAULT_CHARSET, &s)) - { - wxString str(s); - XtFree (s); - return str; - } - else - { - return wxEmptyString; - } + WXWidget w = menu->CreateMenu(this, GetMainWidget(), menu, + pos, title, true); + wxCHECK_MSG( w, false, wxT("failed to create menu") ); + menu->SetButtonWidget(w); } - else - return wxEmptyString; - -} -bool wxMenuBar::OnDelete(wxMenu *menu, int pos) -{ - // Only applies to dynamic deletion (when set in frame) - if (!m_menuBarFrame) - return TRUE; - - menu->DestroyMenu(TRUE); - return TRUE; -} + m_titles.Insert(title, pos); -bool wxMenuBar::OnAppend(wxMenu *menu, const char *title) -{ - // Only applies to dynamic append (when set in frame) - if (!m_menuBarFrame) - return TRUE; - - // Probably should be an assert here - if (menu->GetParent()) - return FALSE; - - // Has already been appended - if (menu->GetButtonWidget()) - return FALSE; - - WXWidget w = menu->CreateMenu(this, GetMainWidget(), menu, title, TRUE); - menu->SetButtonWidget(w); - - return TRUE; + return wxMenuBarBase::Insert(pos, menu, title); } -void wxMenuBar::Append (wxMenu * menu, const wxString& title) +wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title) { - if (!OnAppend(menu, title)) - return; - - m_menuCount ++; - wxMenu **new_menus = new wxMenu *[m_menuCount]; - wxString *new_titles = new wxString[m_menuCount]; - int i; - - for (i = 0; i < m_menuCount - 1; i++) - { - new_menus[i] = m_menus[i]; - m_menus[i] = NULL; - new_titles[i] = m_titles[i]; - m_titles[i] = ""; - } - if (m_menus) - { - delete[]m_menus; - delete[]m_titles; - } - m_menus = new_menus; - m_titles = new_titles; - - m_menus[m_menuCount - 1] = (wxMenu *)menu; - m_titles[m_menuCount - 1] = title; - - menu->SetMenuBar(this); - menu->SetParent(this); + if ( !wxMenuBarBase::Replace(pos, menu, title) ) + return NULL; + + wxFAIL_MSG(wxT("TODO")); + + return NULL; } -void wxMenuBar::Delete(wxMenu * menu, int i) +wxMenu *wxMenuBar::Remove(size_t pos) { - int j; - int ii = (int) i; - - if (menu != 0) - { - for (ii = 0; ii < m_menuCount; ii++) - { - if (m_menus[ii] == menu) - break; - } - if (ii >= m_menuCount) - return; - } else - { - if (ii < 0 || ii >= m_menuCount) - return; - menu = m_menus[ii]; - } - - if (!OnDelete(menu, ii)) - return; - - menu->SetParent((wxEvtHandler*) NULL); - - -- m_menuCount; - for (j = ii; j < m_menuCount; j++) - { - m_menus[j] = m_menus[j + 1]; - m_titles[j] = m_titles[j + 1]; - } + wxMenu *menu = wxMenuBarBase::Remove(pos); + if ( !menu ) + return NULL; + + if ( m_menuBarFrame ) + menu->DestroyMenu(true); + + menu->SetMenuBar(NULL); + + m_titles.RemoveAt(pos); + + return menu; } // Find the menu menuString, item itemString, and return the item id. // Returns -1 if none found. -int wxMenuBar::FindMenuItem (const wxString& menuString, const wxString& itemString) const +int wxMenuBar::FindMenuItem(const wxString& menuString, const wxString& itemString) const { - char buf1[200]; - char buf2[200]; - wxStripMenuCodes ((char *)(const char *)menuString, buf1); - int i; - for (i = 0; i < m_menuCount; i++) + const wxString stripped = wxStripMenuCodes(menuString); + + size_t menuCount = GetMenuCount(); + for (size_t i = 0; i < menuCount; i++) { - wxStripMenuCodes ((char *)(const char *)m_titles[i], buf2); - if (strcmp (buf1, buf2) == 0) - return m_menus[i]->FindItem (itemString); + if ( wxStripMenuCodes(m_titles[i]) == stripped ) + return m_menus.Item(i)->GetData()->FindItem (itemString); } - return -1; + return wxNOT_FOUND; } -wxMenuItem *wxMenuBar::FindItemForId (int id, wxMenu ** itemMenu) const +wxMenuItem *wxMenuBar::FindItem(int id, wxMenu ** itemMenu) const { if (itemMenu) *itemMenu = NULL; - - wxMenuItem *item = NULL; - int i; - for (i = 0; i < m_menuCount; i++) - if ((item = m_menus[i]->FindItemForId (id, itemMenu))) - return item; - return NULL; -} -void wxMenuBar::SetHelpString (int id, const wxString& helpString) -{ - int i; - for (i = 0; i < m_menuCount; i++) + size_t menuCount = GetMenuCount(); + for (size_t i = 0; i < menuCount; i++) { - if (m_menus[i]->FindItemForId (id)) - { - m_menus[i]->SetHelpString (id, helpString); - return; - } + wxMenuItem *item = m_menus.Item(i)->GetData()->FindItem(id, itemMenu); + if (item) return item; } -} -wxString wxMenuBar::GetHelpString (int id) const -{ - int i; - for (i = 0; i < m_menuCount; i++) - { - if (m_menus[i]->FindItemForId (id)) - return wxString(m_menus[i]->GetHelpString (id)); - } - return wxString(""); + return NULL; } // Create menubar bool wxMenuBar::CreateMenuBar(wxFrame* parent) { + m_parent = parent; // bleach... override it! + PreCreation(); + m_parent = NULL; + if (m_mainWidget) { - XtVaSetValues((Widget) parent->GetMainWindowWidget(), XmNmenuBar, (Widget) m_mainWidget, NULL); + XtVaSetValues((Widget) parent->GetMainWidget(), XmNmenuBar, (Widget) m_mainWidget, NULL); /* if (!XtIsManaged((Widget) m_mainWidget)) XtManageChild((Widget) m_mainWidget); */ XtMapWidget((Widget) m_mainWidget); - return TRUE; + return true; } - - Widget menuBarW = XmCreateMenuBar ((Widget) parent->GetMainWindowWidget(), "MenuBar", NULL, 0); + + Widget menuBarW = XmCreateMenuBar ((Widget) parent->GetMainWidget(), + wxMOTIF_STR("MenuBar"), NULL, 0); m_mainWidget = (WXWidget) menuBarW; - - int i; - for (i = 0; i < GetMenuCount(); i++) + + size_t menuCount = GetMenuCount(); + for (size_t i = 0; i < menuCount; i++) { wxMenu *menu = GetMenu(i); wxString title(m_titles[i]); - menu->SetButtonWidget(menu->CreateMenu (this, menuBarW, menu, title, TRUE)); - - /* - * COMMENT THIS OUT IF YOU DON'T LIKE A RIGHT-JUSTIFIED HELP MENU - */ - wxStripMenuCodes ((char*) (const char*) title, wxBuffer); - - if (strcmp (wxBuffer, "Help") == 0) + menu->SetButtonWidget(menu->CreateMenu (this, menuBarW, menu, i, title, true)); + + if (strcmp (wxStripMenuCodes(title), "Help") == 0) XtVaSetValues ((Widget) menuBarW, XmNmenuHelpWidget, (Widget) menu->GetButtonWidget(), NULL); + + // tear off menu support +#if (XmVersion >= 1002) + if ( menu->IsTearOff() ) + { + XtVaSetValues(GetWidget(menu), + XmNtearOffModel, XmTEAR_OFF_ENABLED, + NULL); + Widget tearOff = XmGetTearOffControl(GetWidget(menu)); + wxDoChangeForegroundColour((Widget) tearOff, m_foregroundColour); + wxDoChangeBackgroundColour((Widget) tearOff, m_backgroundColour, true); + } +#endif } - - SetBackgroundColour(m_backgroundColour); - SetForegroundColour(m_foregroundColour); - SetFont(m_font); - - XtVaSetValues((Widget) parent->GetMainWindowWidget(), XmNmenuBar, (Widget) m_mainWidget, NULL); + + PostCreation(); + + XtVaSetValues((Widget) parent->GetMainWidget(), XmNmenuBar, (Widget) m_mainWidget, NULL); XtRealizeWidget ((Widget) menuBarW); XtManageChild ((Widget) menuBarW); SetMenuBarFrame(parent); - - return TRUE; + + return true; } // Destroy menubar, but keep data structures intact so we can recreate it. @@ -864,74 +380,58 @@ bool wxMenuBar::DestroyMenuBar() { if (!m_mainWidget) { - SetMenuBarFrame((wxFrame*) NULL); - return FALSE; + SetMenuBarFrame(NULL); + return false; } - + XtUnmanageChild ((Widget) m_mainWidget); XtUnrealizeWidget ((Widget) m_mainWidget); - - int i; - for (i = 0; i < GetMenuCount(); i++) + + size_t menuCount = GetMenuCount(); + for (size_t i = 0; i < menuCount; i++) { wxMenu *menu = GetMenu(i); - menu->DestroyMenu(TRUE); - + menu->DestroyMenu(true); + } XtDestroyWidget((Widget) m_mainWidget); m_mainWidget = (WXWidget) 0; - - SetMenuBarFrame((wxFrame*) NULL); - - return TRUE; -} -//// Motif-specific + SetMenuBarFrame(NULL); -extern wxApp *wxTheApp; -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... -*/ + return true; +} -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 (menu->GetParent()) + if (GetMainWidget()) + { + wxMenu *menuParent = GetParent(); + if ( menuParent ) { - wxList& list = menu->GetParent()->GetItems(); - list.DeleteObject(menu); + wxMenuItemList::compatibility_iterator node = menuParent->GetMenuItems().GetFirst(); + while ( node ) + { + if ( node->GetData()->GetSubMenu() == this ) + { + delete node->GetData(); + menuParent->GetMenuItems().Erase(node); + + break; + } + + node = node->GetNext(); + } } - menu->DestroyMenu(TRUE); + + DestroyMenu(true); } - /* Mark as no longer popped up */ - menu->m_menuId = -1; - return TRUE; -} -void -wxMenuPopdownCallback(Widget w, XtPointer clientData, - XtPointer 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 ); + // Mark as no longer popped up + m_menuId = -1; } /* @@ -940,77 +440,97 @@ wxMenuPopdownCallback(Widget w, XtPointer clientData, * */ -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 menuIndex, + const wxString& title, + bool pullDown) { Widget menu = (Widget) 0; Widget buttonWidget = (Widget) 0; + Display* dpy = XtDisplay((Widget)parent); 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 ( !m_font.IsOk() ) + { + if ( menuBar ) + m_font = menuBar->GetFont(); + else if ( GetInvokingWindow() ) + m_font = GetInvokingWindow()->GetFont(); + } + + XtSetArg (args[2], (String)wxFont::GetFontTag(), m_font.GetFontTypeC(dpy) ); + if (!pullDown) { - menu = XmCreatePopupMenu ((Widget) parent, "popup", args, 2); + menu = XmCreatePopupMenu ((Widget) parent, wxMOTIF_STR("popup"), args, 3); +#if 0 XtAddCallback(menu, - XmNunmapCallback, + XmNunmapCallback, (XtCallbackProc)wxMenuPopdownCallback, (XtPointer)this); +#endif } else { char mnem = wxFindMnemonic (title); - wxStripMenuCodes ((char*) (const char*) title, wxBuffer); - - menu = XmCreatePulldownMenu ((Widget) parent, "pulldown", args, 2); - - XmString label_str = XmStringCreateSimple (wxBuffer); - buttonWidget = XtVaCreateManagedWidget (wxBuffer, + menu = XmCreatePulldownMenu ((Widget) parent, wxMOTIF_STR("pulldown"), args, 3); + + wxString title2(wxStripMenuCodes(title)); + wxXmString label_str(title2); + buttonWidget = XtVaCreateManagedWidget(title2, #if wxUSE_GADGETS xmCascadeButtonGadgetClass, (Widget) parent, #else xmCascadeButtonWidgetClass, (Widget) parent, #endif - XmNlabelString, label_str, + XmNlabelString, label_str(), XmNsubMenuId, menu, + (String)wxFont::GetFontTag(), m_font.GetFontTypeC(dpy), + XmNpositionIndex, menuIndex, NULL); - + if (mnem != 0) XtVaSetValues (buttonWidget, XmNmnemonic, mnem, NULL); - - XmStringFree (label_str); } - + m_menuWidget = (WXWidget) menu; - - m_menuBar = menuBar; + m_topLevelMenu = topMenu; - - for (wxNode * node = m_menuItems.First (); node; node = node->Next ()) + + size_t i = 0; + for ( wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst(); + node; + node = node->GetNext(), ++i ) { - wxMenuItem *item = (wxMenuItem *) node->Data (); - item->CreateItem (menu, menuBar, topMenu); + wxMenuItem *item = node->GetData(); + + item->CreateItem(menu, menuBar, topMenu, i); } - - SetBackgroundColour(m_backgroundColour); - SetForegroundColour(m_foregroundColour); - SetFont(m_font); - + + ChangeFont(); + return buttonWidget; } // Destroys the Motif implementation of the menu, -// but maintains the wxWindows data structures so we can -// do a CreateMenu again. +// but maintains the wxWidgets data structures so we can +// do a CreateMenu again. void wxMenu::DestroyMenu (bool full) { - for (wxNode * node = m_menuItems.First (); node; node = node->Next ()) + for ( wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst(); + node; + node = node->GetNext() ) { - wxMenuItem *item = (wxMenuItem *) node->Data (); - item->SetMenuBar((wxMenuBar*) NULL); - + wxMenuItem *item = node->GetData(); + item->SetMenuBar(NULL); + item->DestroyItem(full); - } // for() - + } + if (m_buttonWidget) { if (full) @@ -1032,20 +552,22 @@ WXWidget wxMenu::FindMenuItem (int id, wxMenuItem ** it) const if (id == m_menuId) { if (it) - *it = (wxMenuItem*) NULL; + *it = NULL; return m_buttonWidget; } - - for (wxNode * node = m_menuItems.First (); node; node = node->Next ()) + + for ( wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst(); + node; + node = node->GetNext() ) { - wxMenuItem *item = (wxMenuItem *) node->Data (); + wxMenuItem *item = node->GetData (); if (item->GetId() == id) { if (it) *it = item; return item->GetButtonWidget(); } - + if (item->GetSubMenu()) { WXWidget w = item->GetSubMenu()->FindMenuItem (id, it); @@ -1054,48 +576,53 @@ WXWidget wxMenu::FindMenuItem (int id, wxMenuItem ** it) const return w; } } - } // for() - + } + if (it) - *it = (wxMenuItem*) NULL; + *it = NULL; return (WXWidget) NULL; } void wxMenu::SetBackgroundColour(const wxColour& col) { m_backgroundColour = col; + if (!col.IsOk()) + return; if (m_menuWidget) wxDoChangeBackgroundColour(m_menuWidget, (wxColour&) col); if (m_buttonWidget) - wxDoChangeBackgroundColour(m_buttonWidget, (wxColour&) col, TRUE); - - wxNode* node = m_menuItems.First(); - while (node) + wxDoChangeBackgroundColour(m_buttonWidget, (wxColour&) col, true); + + for ( wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst(); + node; + node = node->GetNext() ) { - wxMenuItem* item = (wxMenuItem*) node->Data(); + wxMenuItem* item = node->GetData(); 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); - node = node->Next(); } } void wxMenu::SetForegroundColour(const wxColour& col) { m_foregroundColour = col; + if (!col.IsOk()) + return; if (m_menuWidget) wxDoChangeForegroundColour(m_menuWidget, (wxColour&) col); if (m_buttonWidget) wxDoChangeForegroundColour(m_buttonWidget, (wxColour&) col); - - wxNode* node = m_menuItems.First(); - while (node) + + for ( wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst(); + node; + node = node->GetNext() ) { - wxMenuItem* item = (wxMenuItem*) node->Data(); + wxMenuItem* item = node->GetData(); if (item->GetButtonWidget()) { // This crashes because it uses gadgets @@ -1103,42 +630,44 @@ void wxMenu::SetForegroundColour(const wxColour& col) } if (item->GetSubMenu()) item->GetSubMenu()->SetForegroundColour((wxColour&) col); - node = node->Next(); } } void wxMenu::ChangeFont(bool keepOriginalSize) { - // lesstif 0.87 hangs when setting XmNfontList -#ifndef LESSTIF_VERSION - if (!m_font.Ok() || !m_menuWidget) + // 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.IsOk() || !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); } - wxNode* node = m_menuItems.First(); - while (node) + + for ( wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst(); + node; + node = node->GetNext() ) { - wxMenuItem* item = (wxMenuItem*) node->Data(); - if (m_menuWidget && item->GetButtonWidget() && m_font.Ok()) + wxMenuItem* item = node->GetData(); + if (m_menuWidget && item->GetButtonWidget() && m_font.IsOk()) { XtVaSetValues ((Widget) item->GetButtonWidget(), - XmNfontList, fontList, - NULL); + wxFont::GetFontTag(), m_font.GetFontTypeC(dpy), + NULL); } if (item->GetSubMenu()) item->GetSubMenu()->ChangeFont(keepOriginalSize); - node = node->Next(); } +#else + wxUnusedVar(keepOriginalSize); #endif } @@ -1148,40 +677,51 @@ void wxMenu::SetFont(const wxFont& font) ChangeFont(); } -void wxMenuBar::SetBackgroundColour(const wxColour& col) +bool wxMenuBar::SetBackgroundColour(const wxColour& col) { - - m_backgroundColour = col; + if (!wxWindowBase::SetBackgroundColour(col)) + return false; + if (!col.IsOk()) + return false; if (m_mainWidget) wxDoChangeBackgroundColour(m_mainWidget, (wxColour&) col); - int i; - for (i = 0; i < m_menuCount; i++) - m_menus[i]->SetBackgroundColour((wxColour&) col); + + size_t menuCount = GetMenuCount(); + for (size_t i = 0; i < menuCount; i++) + m_menus.Item(i)->GetData()->SetBackgroundColour((wxColour&) col); + + return true; } -void wxMenuBar::SetForegroundColour(const wxColour& col) +bool wxMenuBar::SetForegroundColour(const wxColour& col) { - m_foregroundColour = col; + if (!wxWindowBase::SetForegroundColour(col)) + return false; + if (!col.IsOk()) + return false; if (m_mainWidget) wxDoChangeForegroundColour(m_mainWidget, (wxColour&) col); - - int i; - for (i = 0; i < m_menuCount; i++) - m_menus[i]->SetForegroundColour((wxColour&) col); + + size_t menuCount = GetMenuCount(); + for (size_t i = 0; i < menuCount; i++) + m_menus.Item(i)->GetData()->SetForegroundColour((wxColour&) col); + + return true; } -void wxMenuBar::ChangeFont(bool keepOriginalSize) +void wxMenuBar::ChangeFont(bool WXUNUSED(keepOriginalSize)) { // Nothing to do for menubar, fonts are kept in wxMenus } -void wxMenuBar::SetFont(const wxFont& font) +bool wxMenuBar::SetFont(const wxFont& font) { m_font = font; ChangeFont(); - - int i; - for (i = 0; i < m_menuCount; i++) - m_menus[i]->SetFont(font); -} + size_t menuCount = GetMenuCount(); + for (size_t i = 0; i < menuCount; i++) + m_menus.Item(i)->GetData()->SetFont(font); + + return true; +}