X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/47d67540a017101b3e46abe9ef0f55914d8de37e..4521f6c88cbefa7f13e3733d344776b795f981e4:/src/motif/menu.cpp?ds=sidebyside diff --git a/src/motif/menu.cpp b/src/motif/menu.cpp index dcaaa94df4..cecd53cf3c 100644 --- a/src/motif/menu.cpp +++ b/src/motif/menu.cpp @@ -1,34 +1,38 @@ ///////////////////////////////////////////////////////////////////////////// -// 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" +#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 @@ -38,50 +42,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; - - //// 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_topLevelMenu = NULL; + m_ownedByMenuBar = false; - if (m_title != "") + if ( !m_title.empty() ) { - Append(ID_SEPARATOR, m_title) ; + Append(-3, m_title) ; AppendSeparator() ; } - - Callback(func); } // The wxWindow destructor will take care of deleting the submenus. @@ -89,827 +83,644 @@ wxMenu::~wxMenu() { if (m_menuWidget) { - if (m_menuParent) - DestroyMenu(TRUE); - else - DestroyMenu(FALSE); + if (m_menuParent) + DestroyMenu(true); + else + 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; + m_menuParent = NULL; + // m_menuBar = NULL; } } void wxMenu::Break() { - m_numColumns ++; + m_numColumns++; } // function appends a new item or submenu to the menu -void wxMenu::Append(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() +wxMenuItem* wxMenu::DoAppend(wxMenuItem *pItem) { - 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; + // 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); } - 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()); - } - */ - - 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); -} - -bool wxMenu::Checked(int id) const -{ - wxMenuItem *item = FindItemForId(id); - wxCHECK( item != NULL, FALSE ); + if ( item->IsSubMenu() ) + { + item->GetSubMenu()->m_topLevelMenu = m_topLevelMenu; + } - return item->IsChecked(); + return pos == GetMenuItemCount() ? wxMenuBase::DoAppend(item) : + wxMenuBase::DoInsert(pos, item); } void wxMenu::SetTitle(const wxString& label) { - m_title = label ; + m_title = label; - wxNode *node = m_menuItems.First (); - if (!node) - return; + wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst(); + if ( !node ) + return; - wxMenuItem *item = (wxMenuItem *) node->Data (); + wxMenuItem *item = node->GetData (); Widget widget = (Widget) item->GetButtonWidget(); - if (!widget) - return; + if ( !widget ) + return; - XmString title_str = XmStringCreateSimple ((char*) (const char*) label); - XtVaSetValues (widget, - XmNlabelString, title_str, - NULL); - // TODO: should we delete title_str now? + wxXmString title_str(label); + XtVaSetValues(widget, + XmNlabelString, title_str(), + NULL); } -const wxString wxMenu::GetTitle() const +bool wxMenu::ProcessCommand(wxCommandEvent & event) { - return m_title; -} + // Try the menu's event handler first + wxEvtHandler * const handler = GetEventHandler(); + bool processed = handler ? handler->SafelyProcessEvent(event) : false; -void wxMenu::SetLabel(int id, const wxString& label) -{ - wxMenuItem *item = FindItemForId(id); - if (item == (wxMenuItem*) NULL) - return; + // Try the window the menu was popped up from (and up + // through the hierarchy) + if ( !processed && GetInvokingWindow()) + processed = GetInvokingWindow()->HandleWindowEvent(event); - item->SetLabel(label); + return processed; } -wxString wxMenu::GetLabel(int id) const +// ---------------------------------------------------------------------------- +// Menu Bar +// ---------------------------------------------------------------------------- + +void wxMenuBar::Init() { - 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; + m_eventHandler = this; + m_menuBarFrame = NULL; + m_mainWidget = (WXWidget) NULL; } -// Finds the item id matching the given string, -1 if not found. -int wxMenu::FindItem (const wxString& itemString) const +wxMenuBar::wxMenuBar(size_t n, wxMenu *menus[], const wxArrayString& titles, long WXUNUSED(style)) { - char buf1[200]; - char buf2[200]; - wxStripMenuCodes ((char *)(const char *)itemString, buf1); + wxASSERT( n == titles.GetCount() ); - 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(); - } - } + Init(); - return -1; + m_titles = titles; + for ( size_t i = 0; i < n; i++ ) + m_menus.Append(menus[i]); } -wxMenuItem *wxMenu::FindItemForId(int itemId, wxMenu ** itemMenu) const +wxMenuBar::wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long WXUNUSED(style)) { - if (itemMenu) - *itemMenu = NULL; - for (wxNode * node = m_menuItems.First (); node; node = node->Next ()) - { - wxMenuItem *item = (wxMenuItem *) node->Data (); + Init(); - 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; - } + for ( size_t i = 0; i < n; i++ ) + { + m_menus.Append(menus[i]); + m_titles.Add(titles[i]); } - - if (itemMenu) - *itemMenu = NULL; - return NULL; } -void wxMenu::SetHelpString(int itemId, const wxString& helpString) +wxMenuBar::~wxMenuBar() { - wxMenuItem *item = FindItemForId (itemId); - if (item) - item->SetHelp(helpString); + // nothing to do: wxMenuBarBase will delete the menus } -wxString wxMenu::GetHelpString (int itemId) const +void wxMenuBar::EnableTop(size_t WXUNUSED(pos), bool WXUNUSED(flag)) { - wxMenuItem *item = FindItemForId (itemId); - wxString str(""); - return (item == NULL) ? str : item->GetHelp(); + // wxFAIL_MSG("TODO"); +// wxLogWarning("wxMenuBar::EnableTop not yet implemented."); } -void wxMenu::ProcessCommand(wxCommandEvent & event) +void wxMenuBar::SetMenuLabel(size_t pos, const wxString& label) { - bool processed = FALSE; + wxMenu *menu = GetMenu(pos); + if ( !menu ) + return; - // Try a callback - if (m_callback) + Widget w = (Widget)menu->GetButtonWidget(); + if (w) { - (void) (*(m_callback)) (*this, event); - processed = TRUE; - } + wxXmString label_str(label); - // Try the menu's event handler - if ( !processed && GetEventHandler()) - { - processed = GetEventHandler()->ProcessEvent(event); + XtVaSetValues(w, + XmNlabelString, label_str(), + NULL); } -/* TODO - // Try the window the menu was popped up from (and up - // through the hierarchy) - if ( !processed && GetInvokingWindow()) - processed = GetInvokingWindow()->ProcessEvent(event); -*/ + m_titles[pos] = label; } -bool wxWindow::PopupMenu(wxMenu *menu, int x, int y) +wxString wxMenuBar::GetMenuLabel(size_t pos) const { - 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->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; + wxCHECK_MSG( pos < GetMenuCount(), wxEmptyString, + wxT("invalid menu index in wxMenuBar::GetMenuLabel") ); + return m_titles[pos]; } -// Menu Bar -wxMenuBar::wxMenuBar() +bool wxMenuBar::Append(wxMenu * menu, const wxString& title) { - m_eventHandler = this; - m_menuCount = 0; - m_menus = NULL; - m_titles = NULL; - m_menuBarFrame = NULL; + return Insert(GetMenuCount(), menu, title); } -wxMenuBar::wxMenuBar(int n, wxMenu *menus[], const wxString titles[]) +bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title) { - 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; -} + 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") ); -wxMenuBar::~wxMenuBar() -{ - int i; - for (i = 0; i < m_menuCount; i++) + if ( m_menuBarFrame ) { - delete m_menus[i]; + WXWidget w = menu->CreateMenu(this, GetMainWidget(), menu, + pos, title, true); + wxCHECK_MSG( w, false, wxT("failed to create menu") ); + menu->SetButtonWidget(w); } - 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) -{ - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(id, &itemMenu) ; - if (!item) - return; - item->Enable(flag); -} + m_titles.Insert(title, pos); -void wxMenuBar::EnableTop(int pos, bool flag) -{ - // TODO + return wxMenuBarBase::Insert(pos, menu, title); } -// Must only be used AFTER menu has been attached to frame, -// otherwise use individual menus -void wxMenuBar::Check(int id, bool flag) +wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title) { - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(id, &itemMenu) ; - if (!item) - return; + if ( !wxMenuBarBase::Replace(pos, menu, title) ) + return NULL; - if (!item->IsCheckable()) - return ; + wxFAIL_MSG(wxT("TODO")); - item->Check(flag); + return NULL; } -bool wxMenuBar::Checked(int id) const +wxMenu *wxMenuBar::Remove(size_t pos) { - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(id, &itemMenu) ; - if (!item) - return FALSE; + wxMenu *menu = wxMenuBarBase::Remove(pos); + if ( !menu ) + return NULL; - return item->IsChecked(); -} + if ( m_menuBarFrame ) + menu->DestroyMenu(true); -bool wxMenuBar::Enabled(int id) const -{ - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(id, &itemMenu) ; - if (!item) - return FALSE; + menu->SetMenuBar(NULL); - return item->IsEnabled(); + m_titles.RemoveAt(pos); + + return menu; } -void wxMenuBar::SetLabel(int id, const wxString& label) +// 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 { - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(id, &itemMenu) ; - - if (!item) - return; + const wxString stripped = wxStripMenuCodes(menuString); - item->SetLabel(label); + size_t menuCount = GetMenuCount(); + for (size_t i = 0; i < menuCount; i++) + { + if ( wxStripMenuCodes(m_titles[i]) == stripped ) + return m_menus.Item(i)->GetData()->FindItem (itemString); + } + return wxNOT_FOUND; } -wxString wxMenuBar::GetLabel(int id) const +wxMenuItem *wxMenuBar::FindItem(int id, wxMenu ** itemMenu) const { - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(id, &itemMenu) ; + if (itemMenu) + *itemMenu = NULL; - if (!item) - return wxString(""); + size_t menuCount = GetMenuCount(); + for (size_t i = 0; i < menuCount; i++) + { + wxMenuItem *item = m_menus.Item(i)->GetData()->FindItem(id, itemMenu); + if (item) return item; + } - return item->GetLabel(); + return NULL; } -void wxMenuBar::SetLabelTop(int pos, const wxString& label) +// Create menubar +bool wxMenuBar::CreateMenuBar(wxFrame* parent) { - wxASSERT( (pos < m_menuCount) ); + m_parent = parent; // bleach... override it! + PreCreation(); + m_parent = NULL; - Widget w = (Widget) m_menus[pos]->GetButtonWidget(); - if (w) + if (m_mainWidget) { - XmString label_str = XmStringCreateSimple ((char*) (const char*) label); - XtVaSetValues (w, - XmNlabelString, label_str, - NULL); - XmStringFree (label_str); + XtVaSetValues((Widget) parent->GetMainWidget(), XmNmenuBar, (Widget) m_mainWidget, NULL); + /* + if (!XtIsManaged((Widget) m_mainWidget)) + XtManageChild((Widget) m_mainWidget); + */ + XtMapWidget((Widget) m_mainWidget); + return true; } -} -wxString wxMenuBar::GetLabelTop(int pos) const -{ - wxASSERT( (pos < m_menuCount) ); + Widget menuBarW = XmCreateMenuBar ((Widget) parent->GetMainWidget(), + wxMOTIF_STR("MenuBar"), NULL, 0); + m_mainWidget = (WXWidget) menuBarW; - Widget w = (Widget) m_menus[pos]->GetButtonWidget(); - if (w) + size_t menuCount = GetMenuCount(); + for (size_t i = 0; i < menuCount; i++) { - 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; - } + wxMenu *menu = GetMenu(i); + wxString title(m_titles[i]); + 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 } - else - return wxEmptyString; -} + PostCreation(); -bool wxMenuBar::OnDelete(wxMenu *menu, int pos) -{ - // Only applies to dynamic deletion (when set in frame) - if (!m_menuBarFrame) - return TRUE; + XtVaSetValues((Widget) parent->GetMainWidget(), XmNmenuBar, (Widget) m_mainWidget, NULL); + XtRealizeWidget ((Widget) menuBarW); + XtManageChild ((Widget) menuBarW); + SetMenuBarFrame(parent); - menu->DestroyMenu(TRUE); - return TRUE; + return true; } -bool wxMenuBar::OnAppend(wxMenu *menu, const char *title) +// Destroy menubar, but keep data structures intact so we can recreate it. +bool wxMenuBar::DestroyMenuBar() { - // Only applies to dynamic append (when set in frame) - if (!m_menuBarFrame) - return TRUE; + if (!m_mainWidget) + { + SetMenuBarFrame(NULL); + return false; + } + + XtUnmanageChild ((Widget) m_mainWidget); + XtUnrealizeWidget ((Widget) m_mainWidget); - // Probably should be an assert here - if (menu->GetParent()) - return FALSE; + size_t menuCount = GetMenuCount(); + for (size_t i = 0; i < menuCount; i++) + { + wxMenu *menu = GetMenu(i); + menu->DestroyMenu(true); - // Has already been appended - if (menu->GetButtonWidget()) - return FALSE; + } + XtDestroyWidget((Widget) m_mainWidget); + m_mainWidget = (WXWidget) 0; - WXWidget w = menu->CreateMenu(this, GetMainWidget(), menu, title, TRUE); - menu->SetButtonWidget(w); + SetMenuBarFrame(NULL); - return TRUE; + return true; } -void wxMenuBar::Append (wxMenu * menu, const wxString& title) +// 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() { - 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) + if (GetMainWidget()) { - delete[]m_menus; - delete[]m_titles; - } - m_menus = new_menus; - m_titles = new_titles; + wxMenu *menuParent = GetParent(); + if ( menuParent ) + { + 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(); + } + } - m_menus[m_menuCount - 1] = (wxMenu *)menu; - m_titles[m_menuCount - 1] = title; + DestroyMenu(true); + } - menu->SetMenuBar(this); - menu->SetParent(this); + // Mark as no longer popped up + m_menuId = -1; } -void wxMenuBar::Delete(wxMenu * menu, int i) -{ - int j; - int ii = (int) i; +/* +* Create a popup or pulldown menu. +* Submenus of a popup will be pulldown. +* +*/ - if (menu != 0) +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, (m_numColumns > 1) ? XmPACK_COLUMN : XmPACK_TIGHT); + + if ( !m_font.IsOk() ) { - 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 ( menuBar ) + m_font = menuBar->GetFont(); + else if ( GetInvokingWindow() ) + m_font = GetInvokingWindow()->GetFont(); } - if (!OnDelete(menu, ii)) - return; - - menu->SetParent((wxEvtHandler*) NULL); + XtSetArg (args[2], (String)wxFont::GetFontTag(), m_font.GetFontTypeC(dpy) ); - -- m_menuCount; - for (j = ii; j < m_menuCount; j++) + if (!pullDown) { - m_menus[j] = m_menus[j + 1]; - m_titles[j] = m_titles[j + 1]; + menu = XmCreatePopupMenu ((Widget) parent, wxMOTIF_STR("popup"), args, 3); +#if 0 + XtAddCallback(menu, + XmNunmapCallback, + (XtCallbackProc)wxMenuPopdownCallback, + (XtPointer)this); +#endif } -} + else + { + char mnem = wxFindMnemonic (title); + menu = XmCreatePulldownMenu ((Widget) parent, wxMOTIF_STR("pulldown"), args, 3); -// 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 -{ - char buf1[200]; - char buf2[200]; - wxStripMenuCodes ((char *)(const char *)menuString, buf1); - int i; - for (i = 0; i < m_menuCount; i++) + 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(), + XmNsubMenuId, menu, + (String)wxFont::GetFontTag(), m_font.GetFontTypeC(dpy), + XmNpositionIndex, menuIndex, + NULL); + + if (mnem != 0) + XtVaSetValues (buttonWidget, XmNmnemonic, mnem, NULL); + } + + m_menuWidget = (WXWidget) menu; + + m_topLevelMenu = topMenu; + + size_t i = 0; + for ( wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst(); + node; + node = node->GetNext(), ++i ) { - wxStripMenuCodes ((char *)(const char *)m_titles[i], buf2); - if (strcmp (buf1, buf2) == 0) - return m_menus[i]->FindItem (itemString); + wxMenuItem *item = node->GetData(); + + item->CreateItem(menu, menuBar, topMenu, i); } - return -1; -} -wxMenuItem *wxMenuBar::FindItemForId (int id, wxMenu ** itemMenu) const -{ - if (itemMenu) - *itemMenu = NULL; + ChangeFont(); - wxMenuItem *item = NULL; - int i; - for (i = 0; i < m_menuCount; i++) - if ((item = m_menus[i]->FindItemForId (id, itemMenu))) - return item; - return NULL; + return buttonWidget; } -void wxMenuBar::SetHelpString (int id, const wxString& helpString) +// Destroys the Motif implementation of the menu, +// but maintains the wxWidgets data structures so we can +// do a CreateMenu again. +void wxMenu::DestroyMenu (bool full) { - int i; - for (i = 0; i < m_menuCount; i++) + for ( wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst(); + node; + node = node->GetNext() ) { - if (m_menus[i]->FindItemForId (id)) + wxMenuItem *item = node->GetData(); + item->SetMenuBar(NULL); + + item->DestroyItem(full); + } + + if (m_buttonWidget) + { + if (full) { - m_menus[i]->SetHelpString (id, helpString); - return; + XtVaSetValues((Widget) m_buttonWidget, XmNsubMenuId, NULL, NULL); + XtDestroyWidget ((Widget) m_buttonWidget); + m_buttonWidget = (WXWidget) 0; } } + if (m_menuWidget && full) + { + XtDestroyWidget((Widget) m_menuWidget); + m_menuWidget = (WXWidget) NULL; + } } -wxString wxMenuBar::GetHelpString (int id) const +WXWidget wxMenu::FindMenuItem (int id, wxMenuItem ** it) const { - int i; - for (i = 0; i < m_menuCount; i++) + if (id == m_menuId) { - if (m_menus[i]->FindItemForId (id)) - return wxString(m_menus[i]->GetHelpString (id)); + if (it) + *it = NULL; + return m_buttonWidget; } - return wxString(""); -} -//// Motif-specific + for ( wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst(); + node; + node = node->GetNext() ) + { + wxMenuItem *item = node->GetData (); + if (item->GetId() == id) + { + if (it) + *it = item; + return item->GetButtonWidget(); + } -extern wxApp *wxTheApp; -static XtWorkProcId WorkProcMenuId; + if (item->GetSubMenu()) + { + WXWidget w = item->GetSubMenu()->FindMenuItem (id, it); + if (w) + { + return w; + } + } + } -/* 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... - */ + if (it) + *it = NULL; + return (WXWidget) NULL; +} -int PostDeletionOfMenu( XtPointer* clientData ) +void wxMenu::SetBackgroundColour(const wxColour& col) { - XtRemoveWorkProc(WorkProcMenuId); - wxMenu *menu = (wxMenu *)clientData; + m_backgroundColour = col; + if (!col.IsOk()) + return; + if (m_menuWidget) + wxDoChangeBackgroundColour(m_menuWidget, (wxColour&) col); + if (m_buttonWidget) + wxDoChangeBackgroundColour(m_buttonWidget, (wxColour&) col, true); - if (menu->GetMainWidget()) { - wxList& list = menu->GetParent()->GetItems(); - list.DeleteObject(menu); - menu->DestroyMenu(TRUE); - } - /* Mark as no longer popped up */ - menu->m_menuId = -1; - return TRUE; + for ( wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst(); + node; + node = node->GetNext() ) + { + wxMenuItem* item = node->GetData(); + if (item->GetButtonWidget()) + { + // This crashes because it uses gadgets + // wxDoChangeBackgroundColour(item->GetButtonWidget(), (wxColour&) col, true); + } + if (item->GetSubMenu()) + item->GetSubMenu()->SetBackgroundColour((wxColour&) col); + } } -void -wxMenuPopdownCallback(Widget w, XtPointer clientData, - XtPointer ptr) +void wxMenu::SetForegroundColour(const wxColour& col) { - 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!! :( - */ + m_foregroundColour = col; + if (!col.IsOk()) + return; + if (m_menuWidget) + wxDoChangeForegroundColour(m_menuWidget, (wxColour&) col); + if (m_buttonWidget) + wxDoChangeForegroundColour(m_buttonWidget, (wxColour&) col); - WorkProcMenuId = XtAppAddWorkProc( - (XtAppContext) wxTheApp->GetAppContext(), - (XtWorkProc) PostDeletionOfMenu, - (XtPointer) menu ); - // Apparently not found in Motif headers - // XtVaSetValues( w, XmNpopupEnabled, XmPOPUP_DISABLED, NULL ); + for ( wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst(); + node; + node = node->GetNext() ) + { + wxMenuItem* item = node->GetData(); + if (item->GetButtonWidget()) + { + // This crashes because it uses gadgets + // wxDoChangeForegroundColour(item->GetButtonWidget(), (wxColour&) col); + } + if (item->GetSubMenu()) + item->GetSubMenu()->SetForegroundColour((wxColour&) col); + } } -/* - * Create a popup or pulldown menu. - * Submenus of a popup will be pulldown. - * - */ - -WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar, WXWidget parent, wxMenu * topMenu, const wxString& title, bool pullDown) +void wxMenu::ChangeFont(bool keepOriginalSize) { - Widget menu = (Widget) 0; - Widget buttonWidget = (Widget) 0; - Arg args[5]; - XtSetArg (args[0], XmNnumColumns, m_numColumns); - XtSetArg (args[1], XmNpacking, XmPACK_COLUMN); + // 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; - if (!pullDown) + Display* dpy = XtDisplay((Widget) m_menuWidget); + + XtVaSetValues ((Widget) m_menuWidget, + wxFont::GetFontTag(), m_font.GetFontTypeC(dpy), + NULL); + if (m_buttonWidget) { - menu = XmCreatePopupMenu ((Widget) parent, "popup", args, 2); - XtAddCallback(menu, - XmNunmapCallback, - (XtCallbackProc)wxMenuPopdownCallback, - (XtPointer)this); + XtVaSetValues ((Widget) m_buttonWidget, + wxFont::GetFontTag(), m_font.GetFontTypeC(dpy), + NULL); } - 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, -#if wxUSE_GADGETS - xmCascadeButtonGadgetClass, (Widget) parent, + for ( wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst(); + node; + node = node->GetNext() ) + { + wxMenuItem* item = node->GetData(); + if (m_menuWidget && item->GetButtonWidget() && m_font.IsOk()) + { + XtVaSetValues ((Widget) item->GetButtonWidget(), + wxFont::GetFontTag(), m_font.GetFontTypeC(dpy), + NULL); + } + if (item->GetSubMenu()) + item->GetSubMenu()->ChangeFont(keepOriginalSize); + } #else - xmCascadeButtonWidgetClass, (Widget) parent, + wxUnusedVar(keepOriginalSize); #endif - XmNlabelString, label_str, - XmNsubMenuId, menu, - NULL); - - if (mnem != 0) - XtVaSetValues (buttonWidget, XmNmnemonic, mnem, NULL); - - XmStringFree (label_str); - } +} - m_menuWidget = (WXWidget) menu; +void wxMenu::SetFont(const wxFont& font) +{ + m_font = font; + ChangeFont(); +} - m_menuBar = menuBar; - m_topLevelMenu = topMenu; +bool wxMenuBar::SetBackgroundColour(const wxColour& col) +{ + if (!wxWindowBase::SetBackgroundColour(col)) + return false; + if (!col.IsOk()) + return false; + if (m_mainWidget) + wxDoChangeBackgroundColour(m_mainWidget, (wxColour&) col); - for (wxNode * node = m_menuItems.First (); node; node = node->Next ()) - { - wxMenuItem *item = (wxMenuItem *) node->Data (); - item->CreateItem (menu, menuBar, topMenu); - } + size_t menuCount = GetMenuCount(); + for (size_t i = 0; i < menuCount; i++) + m_menus.Item(i)->GetData()->SetBackgroundColour((wxColour&) col); - return buttonWidget; + return true; } -// Destroys the Motif implementation of the menu, -// but maintains the wxWindows data structures so we can -// do a CreateMenu again. -void wxMenu::DestroyMenu (bool full) +bool wxMenuBar::SetForegroundColour(const wxColour& col) { - for (wxNode * node = m_menuItems.First (); node; node = node->Next ()) - { - wxMenuItem *item = (wxMenuItem *) node->Data (); - item->SetMenuBar((wxMenuBar*) NULL); + if (!wxWindowBase::SetForegroundColour(col)) + return false; + if (!col.IsOk()) + return false; + if (m_mainWidget) + wxDoChangeForegroundColour(m_mainWidget, (wxColour&) col); - item->DestroyItem(full); - } // for() + size_t menuCount = GetMenuCount(); + for (size_t i = 0; i < menuCount; i++) + m_menus.Item(i)->GetData()->SetForegroundColour((wxColour&) col); - if (m_buttonWidget) - { - if (full) - { - XtVaSetValues((Widget) m_buttonWidget, XmNsubMenuId, NULL, NULL); - XtDestroyWidget ((Widget) m_buttonWidget); - m_buttonWidget = (WXWidget) 0; - } - } - if (m_menuWidget && full) - { - XtDestroyWidget((Widget) m_menuWidget); - m_menuWidget = (WXWidget) NULL; - } + return true; } -WXWidget wxMenu::FindMenuItem (int id, wxMenuItem ** it) const +void wxMenuBar::ChangeFont(bool WXUNUSED(keepOriginalSize)) { - if (id == m_menuId) - { - if (it) - *it = (wxMenuItem*) NULL; - return m_buttonWidget; - } + // Nothing to do for menubar, fonts are kept in wxMenus +} - for (wxNode * node = m_menuItems.First (); node; node = node->Next ()) - { - wxMenuItem *item = (wxMenuItem *) node->Data (); - if (item->GetId() == id) - { - if (it) - *it = item; - return item->GetButtonWidget(); - } - - if (item->GetSubMenu()) - { - WXWidget w = item->GetSubMenu()->FindMenuItem (id, it); - if (w) - { - return w; - } - } - } // for() - - if (it) - *it = (wxMenuItem*) NULL; - return (WXWidget) NULL; +bool wxMenuBar::SetFont(const wxFont& font) +{ + m_font = font; + ChangeFont(); + + size_t menuCount = GetMenuCount(); + for (size_t i = 0; i < menuCount; i++) + m_menus.Item(i)->GetData()->SetFont(font); + + return true; }