X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4bb6408c2631988fab9925014c6619358bf867de..51ec29ea5d1d1093bafbae27a8483211a90d9659:/src/motif/menu.cpp diff --git a/src/motif/menu.cpp b/src/motif/menu.cpp index 468ed194e4..02ada167a3 100644 --- a/src/motif/menu.cpp +++ b/src/motif/menu.cpp @@ -1,32 +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" +#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 @@ -36,563 +43,685 @@ #include #include #include +#ifdef __VMS__ +#pragma message enable nosimpint +#endif + +#include "wx/motif/private.h" // other standard headers -// ---------------------- #include -void wxMenuItemCallback (Widget w, XtPointer clientData, - XtPointer ptr); -void wxMenuItemArmCallback (Widget w, XtPointer clientData, - XtPointer ptr); -void wxMenuItemDisarmCallback (Widget w, XtPointer clientData, - XtPointer ptr); - -#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_topMenu = (wxMenu*) NULL; - m_ownedByMenuBar = FALSE; - m_menuParent = (wxMenu*) NULL; + m_topLevelMenu = NULL; + m_ownedByMenuBar = false; - if (m_title != "") + if ( !m_title.empty() ) { - Append(-2, m_title) ; + Append(-3, m_title) ; AppendSeparator() ; } - - Callback(func); - - // TODO create menu } // The wxWindow destructor will take care of deleting the submenus. wxMenu::~wxMenu() { - // TODO destroy menu and children - - wxNode *node = m_menuItems.First(); - while (node) + if (m_menuWidget) { - wxMenuItem *item = (wxMenuItem *)node->Data(); - - // Delete child menus. - // Beware: they must not be appended to children list!!! - // (because order of delete is significant) - if (item->GetSubMenu()) - item->DeleteSubMenu(); + if (m_menuParent) + DestroyMenu(true); + else + DestroyMenu(false); + } - wxNode *next = node->Next(); - delete item; - delete node; - node = next; + // Not sure if this is right + if (m_menuParent && m_menuBar) + { + m_menuParent = NULL; + // m_menuBar = NULL; } } void wxMenu::Break() { - // TODO + m_numColumns++; } // function appends a new item or submenu to the menu -void wxMenu::Append(wxMenuItem *pItem) +wxMenuItem* wxMenu::DoAppend(wxMenuItem *pItem) { - // TODO - - wxCHECK_RET( pItem != NULL, "can't append NULL item to the menu" ); - - m_menuItems.Append(pItem); - - m_noItems++; + return DoInsert(GetMenuItemCount(), pItem); } -void wxMenu::AppendSeparator() +wxMenuItem *wxMenu::DoRemove(wxMenuItem *item) { - // TODO - Append(new wxMenuItem(this, ID_SEPARATOR)); -} + item->DestroyItem(true); -// Pullright item -void wxMenu::Append(int Id, const wxString& label, wxMenu *SubMenu, - const wxString& helpString) -{ - Append(new wxMenuItem(this, Id, label, helpString, FALSE, SubMenu)); + return wxMenuBase::DoRemove(item); } -// Ordinary menu item -void wxMenu::Append(int Id, const wxString& label, - const wxString& helpString, bool checkable) +wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item) { - // 'checkable' parameter is useless for Windows. - Append(new wxMenuItem(this, Id, label, helpString, checkable)); + 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); + } + + if ( item->IsSubMenu() ) + { + item->GetSubMenu()->m_topLevelMenu = m_topLevelMenu; + } + + return pos == GetMenuItemCount() ? wxMenuBase::DoAppend(item) : + wxMenuBase::DoInsert(pos, item); } -void wxMenu::Delete(int id) +void wxMenu::SetTitle(const wxString& label) { - wxNode *node; - wxMenuItem *item; - int pos; + m_title = label; - for (pos = 0, node = m_menuItems.First(); node; node = node->Next(), pos++) { - item = (wxMenuItem *)node->Data(); - if (item->GetId() == id) - break; - } - - if (!node) - return; + wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst(); + if ( !node ) + return; - m_menuItems.DeleteNode(node); - delete item; + wxMenuItem *item = node->GetData (); + Widget widget = (Widget) item->GetButtonWidget(); + if ( !widget ) + return; - // TODO + wxXmString title_str(label); + XtVaSetValues(widget, + XmNlabelString, title_str(), + NULL); } -void wxMenu::Enable(int Id, bool Flag) +bool wxMenu::ProcessCommand(wxCommandEvent & event) { - wxMenuItem *item = FindItemForId(Id); - wxCHECK_RET( item != NULL, "can't enable non-existing menu item" ); + // Try the menu's event handler first + wxEvtHandler * const handler = GetEventHandler(); + bool processed = handler ? handler->SafelyProcessEvent(event) : false; + + // Try the window the menu was popped up from (and up + // through the hierarchy) + if ( !processed && GetInvokingWindow()) + processed = GetInvokingWindow()->HandleWindowEvent(event); - item->Enable(Flag); + return processed; } -bool wxMenu::Enabled(int Id) const -{ - wxMenuItem *item = FindItemForId(Id); - wxCHECK( item != NULL, FALSE ); +// ---------------------------------------------------------------------------- +// Menu Bar +// ---------------------------------------------------------------------------- - return item->IsEnabled(); +void wxMenuBar::Init() +{ + m_eventHandler = this; + m_menuBarFrame = NULL; + m_mainWidget = (WXWidget) NULL; } -void wxMenu::Check(int Id, bool Flag) +wxMenuBar::wxMenuBar(size_t n, wxMenu *menus[], const wxArrayString& titles, long WXUNUSED(style)) { - wxMenuItem *item = FindItemForId(Id); - wxCHECK_RET( item != NULL, "can't get status of non-existing menu item" ); + wxASSERT( n == titles.GetCount() ); + + Init(); - item->Check(Flag); + m_titles = titles; + for ( size_t i = 0; i < n; i++ ) + m_menus.Append(menus[i]); } -bool wxMenu::Checked(int Id) const +wxMenuBar::wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long WXUNUSED(style)) { - wxMenuItem *item = FindItemForId(Id); - wxCHECK( item != NULL, FALSE ); + Init(); - return item->IsChecked(); + for ( size_t i = 0; i < n; i++ ) + { + m_menus.Append(menus[i]); + m_titles.Add(titles[i]); + } } -void wxMenu::SetTitle(const wxString& label) +wxMenuBar::~wxMenuBar() { - m_title = label ; - // TODO + // nothing to do: wxMenuBarBase will delete the menus } -const wxString wxMenu::GetTitle() const +void wxMenuBar::EnableTop(size_t WXUNUSED(pos), bool WXUNUSED(flag)) { - return m_title; + // wxFAIL_MSG("TODO"); +// wxLogWarning("wxMenuBar::EnableTop not yet implemented."); } -void wxMenu::SetLabel(int id, const wxString& label) +void wxMenuBar::SetMenuLabel(size_t pos, const wxString& label) { - wxMenuItem *item = FindItemForId(id) ; - if (item==NULL) + wxMenu *menu = GetMenu(pos); + if ( !menu ) return; - if (item->GetSubMenu()==NULL) + Widget w = (Widget)menu->GetButtonWidget(); + if (w) { - // TODO - } - else - { - // TODO + wxXmString label_str(label); + + XtVaSetValues(w, + XmNlabelString, label_str(), + NULL); } - item->SetName(label); + m_titles[pos] = label; } -wxString wxMenu::GetLabel(int Id) const +wxString wxMenuBar::GetMenuLabel(size_t pos) const { - // TODO - return wxString("") ; + wxCHECK_MSG( pos < GetMenuCount(), wxEmptyString, + wxT("invalid menu index in wxMenuBar::GetMenuLabel") ); + return m_titles[pos]; } -// Finds the item id matching the given string, -1 if not found. -int wxMenu::FindItem (const wxString& itemString) const +bool wxMenuBar::Append(wxMenu * menu, const wxString& title) { - char buf1[200]; - char buf2[200]; - wxStripMenuCodes ((char *)(const char *)itemString, buf1); + return Insert(GetMenuCount(), menu, title); +} - for (wxNode * node = m_menuItems.First (); node; node = node->Next ()) +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 ) { - 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(); - } + WXWidget w = menu->CreateMenu(this, GetMainWidget(), menu, + pos, title, true); + wxCHECK_MSG( w, false, wxT("failed to create menu") ); + menu->SetButtonWidget(w); } - return -1; + m_titles.Insert(title, pos); + + return wxMenuBarBase::Insert(pos, menu, title); } -wxMenuItem *wxMenu::FindItemForId(int itemId, wxMenu ** itemMenu) const +wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title) { - 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 ( !wxMenuBarBase::Replace(pos, menu, title) ) + return NULL; - if (item->GetSubMenu()) - { - wxMenuItem *ans = item->GetSubMenu()->FindItemForId (itemId, itemMenu); - if (ans) - return ans; - } - } + wxFAIL_MSG(wxT("TODO")); - if (itemMenu) - *itemMenu = NULL; return NULL; } -void wxMenu::SetHelpString(int itemId, const wxString& helpString) +wxMenu *wxMenuBar::Remove(size_t pos) { - wxMenuItem *item = FindItemForId (itemId); - if (item) - item->SetHelp(helpString); -} + wxMenu *menu = wxMenuBarBase::Remove(pos); + if ( !menu ) + return NULL; -wxString wxMenu::GetHelpString (int itemId) const -{ - wxMenuItem *item = FindItemForId (itemId); - wxString str(""); - return (item == NULL) ? str : item->GetHelp(); + if ( m_menuBarFrame ) + menu->DestroyMenu(true); + + menu->SetMenuBar(NULL); + + m_titles.RemoveAt(pos); + + return menu; } -void wxMenu::ProcessCommand(wxCommandEvent & event) +// 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 { - bool processed = FALSE; + const wxString stripped = wxStripMenuCodes(menuString); - // Try a callback - if (m_callback) + size_t menuCount = GetMenuCount(); + for (size_t i = 0; i < menuCount; i++) { - (void) (*(m_callback)) (*this, event); - processed = TRUE; + if ( wxStripMenuCodes(m_titles[i]) == stripped ) + return m_menus.Item(i)->GetData()->FindItem (itemString); } + return wxNOT_FOUND; +} - // Try the menu's event handler - if ( !processed && GetEventHandler()) +wxMenuItem *wxMenuBar::FindItem(int id, wxMenu ** itemMenu) const +{ + if (itemMenu) + *itemMenu = NULL; + + size_t menuCount = GetMenuCount(); + for (size_t i = 0; i < menuCount; i++) { - processed = GetEventHandler()->ProcessEvent(event); + wxMenuItem *item = m_menus.Item(i)->GetData()->FindItem(id, itemMenu); + if (item) return item; } -/* TODO - // Try the window the menu was popped up from (and up - // through the hierarchy) - if ( !processed && GetInvokingWindow()) - processed = GetInvokingWindow()->ProcessEvent(event); -*/ -} -bool wxWindow::PopupMenu(wxMenu *menu, int x, int y) -{ - // TODO - return FALSE; + return NULL; } -// Menu Bar -wxMenuBar::wxMenuBar() +// Create menubar +bool wxMenuBar::CreateMenuBar(wxFrame* parent) { - m_eventHandler = this; - m_menuCount = 0; - m_menus = NULL; - m_titles = NULL; - m_menuBarFrame = NULL; + m_parent = parent; // bleach... override it! + PreCreation(); + m_parent = NULL; - // TODO -} + if (m_mainWidget) + { + XtVaSetValues((Widget) parent->GetMainWidget(), XmNmenuBar, (Widget) m_mainWidget, NULL); + /* + if (!XtIsManaged((Widget) m_mainWidget)) + XtManageChild((Widget) m_mainWidget); + */ + XtMapWidget((Widget) m_mainWidget); + return true; + } -wxMenuBar::wxMenuBar(int n, wxMenu *menus[], const wxString titles[]) -{ - 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; + Widget menuBarW = XmCreateMenuBar ((Widget) parent->GetMainWidget(), + wxMOTIF_STR("MenuBar"), NULL, 0); + m_mainWidget = (WXWidget) menuBarW; + + 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, i, title, true)); - // TODO + 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 + } + + PostCreation(); + + XtVaSetValues((Widget) parent->GetMainWidget(), XmNmenuBar, (Widget) m_mainWidget, NULL); + XtRealizeWidget ((Widget) menuBarW); + XtManageChild ((Widget) menuBarW); + SetMenuBarFrame(parent); + + return true; } -wxMenuBar::~wxMenuBar() +// Destroy menubar, but keep data structures intact so we can recreate it. +bool wxMenuBar::DestroyMenuBar() { - int i; - for (i = 0; i < m_menuCount; i++) + if (!m_mainWidget) { - delete m_menus[i]; + SetMenuBarFrame(NULL); + return false; } - delete[] m_menus; - delete[] m_titles; - // TODO -} + XtUnmanageChild ((Widget) m_mainWidget); + XtUnrealizeWidget ((Widget) m_mainWidget); -// 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; + size_t menuCount = GetMenuCount(); + for (size_t i = 0; i < menuCount; i++) + { + wxMenu *menu = GetMenu(i); + menu->DestroyMenu(true); - // TODO -} + } + XtDestroyWidget((Widget) m_mainWidget); + m_mainWidget = (WXWidget) 0; -void wxMenuBar::EnableTop(int pos, bool flag) -{ - // TODO + SetMenuBarFrame(NULL); + + return true; } -// Must only be used AFTER menu has been attached to frame, -// otherwise use individual menus -void wxMenuBar::Check(int id, bool flag) +// 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() { - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(id, &itemMenu) ; - if (!item) - return; + if (GetMainWidget()) + { + 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(); + } + } - if (!item->IsCheckable()) - return ; + DestroyMenu(true); + } - // TODO + // Mark as no longer popped up + m_menuId = -1; } -bool wxMenuBar::Checked(int id) const -{ - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(id, &itemMenu) ; - if (!item) - return FALSE; +/* +* Create a popup or pulldown menu. +* Submenus of a popup will be pulldown. +* +*/ - // TODO - return FALSE; -} +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() ) + { + if ( menuBar ) + m_font = menuBar->GetFont(); + else if ( GetInvokingWindow() ) + m_font = GetInvokingWindow()->GetFont(); + } -bool wxMenuBar::Enabled(int id) const -{ - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(id, &itemMenu) ; - if (!item) - return FALSE; + XtSetArg (args[2], (String)wxFont::GetFontTag(), m_font.GetFontTypeC(dpy) ); - // TODO - return FALSE ; -} + if (!pullDown) + { + 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); + + 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; -void wxMenuBar::SetLabel(int id, const wxString& label) -{ - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(id, &itemMenu) ; + m_topLevelMenu = topMenu; - if (!item) - return; + size_t i = 0; + for ( wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst(); + node; + node = node->GetNext(), ++i ) + { + wxMenuItem *item = node->GetData(); + + item->CreateItem(menu, menuBar, topMenu, i); + } + + ChangeFont(); - // TODO + return buttonWidget; } -wxString wxMenuBar::GetLabel(int id) const +// 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) { - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(id, &itemMenu) ; + for ( wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst(); + node; + node = node->GetNext() ) + { + wxMenuItem *item = node->GetData(); + item->SetMenuBar(NULL); - if (!item) - return wxString(""); + item->DestroyItem(full); + } - // TODO - return wxString("") ; + 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; + } } -void wxMenuBar::SetLabelTop(int pos, const wxString& label) +WXWidget wxMenu::FindMenuItem (int id, wxMenuItem ** it) const { - // TODO -} + if (id == m_menuId) + { + if (it) + *it = NULL; + return m_buttonWidget; + } -wxString wxMenuBar::GetLabelTop(int pos) const -{ - // TODO - return wxString(""); -} + 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(); + } -bool wxMenuBar::OnDelete(wxMenu *a_menu, int pos) -{ - // TODO - return FALSE; -} + if (item->GetSubMenu()) + { + WXWidget w = item->GetSubMenu()->FindMenuItem (id, it); + if (w) + { + return w; + } + } + } -bool wxMenuBar::OnAppend(wxMenu *a_menu, const char *title) -{ - // TODO - return FALSE; + if (it) + *it = NULL; + return (WXWidget) NULL; } -void wxMenuBar::Append (wxMenu * menu, const wxString& title) +void wxMenu::SetBackgroundColour(const wxColour& col) { - if (!OnAppend(menu, title)) + m_backgroundColour = col; + if (!col.IsOk()) 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 (m_menuWidget) + wxDoChangeBackgroundColour(m_menuWidget, (wxColour&) col); + if (m_buttonWidget) + wxDoChangeBackgroundColour(m_buttonWidget, (wxColour&) col, true); + + for ( wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst(); + node; + node = node->GetNext() ) { - delete[]m_menus; - delete[]m_titles; + 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); } - m_menus = new_menus; - m_titles = new_titles; - - m_menus[m_menuCount - 1] = (wxMenu *)menu; - m_titles[m_menuCount - 1] = title; - - // TODO } -void wxMenuBar::Delete(wxMenu * menu, int i) +void wxMenu::SetForegroundColour(const wxColour& col) { - int j; - int ii = (int) i; - - if (menu != 0) + m_foregroundColour = col; + if (!col.IsOk()) + return; + if (m_menuWidget) + wxDoChangeForegroundColour(m_menuWidget, (wxColour&) col); + if (m_buttonWidget) + wxDoChangeForegroundColour(m_buttonWidget, (wxColour&) col); + + for ( wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst(); + node; + node = node->GetNext() ) { - for (ii = 0; ii < m_menuCount; ii++) + wxMenuItem* item = node->GetData(); + if (item->GetButtonWidget()) { - if (m_menus[ii] == menu) - break; - } - if (ii >= m_menuCount) - return; - } else - { - if (ii < 0 || ii >= m_menuCount) - return; - menu = m_menus[ii]; + // This crashes because it uses gadgets + // wxDoChangeForegroundColour(item->GetButtonWidget(), (wxColour&) col); + } + if (item->GetSubMenu()) + item->GetSubMenu()->SetForegroundColour((wxColour&) col); } +} - if (!OnDelete(menu, ii)) +void wxMenu::ChangeFont(bool keepOriginalSize) +{ + // 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; - menu->SetParent(NULL); + Display* dpy = XtDisplay((Widget) m_menuWidget); - -- m_menuCount; - for (j = ii; j < m_menuCount; j++) + XtVaSetValues ((Widget) m_menuWidget, + wxFont::GetFontTag(), m_font.GetFontTypeC(dpy), + NULL); + if (m_buttonWidget) { - m_menus[j] = m_menus[j + 1]; - m_titles[j] = m_titles[j + 1]; + XtVaSetValues ((Widget) m_buttonWidget, + wxFont::GetFontTag(), m_font.GetFontTypeC(dpy), + NULL); } -} -// 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++) + for ( wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst(); + node; + node = node->GetNext() ) { - wxStripMenuCodes ((char *)(const char *)m_titles[i], buf2); - if (strcmp (buf1, buf2) == 0) - return m_menus[i]->FindItem (itemString); + 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); } - return -1; +#else + wxUnusedVar(keepOriginalSize); +#endif } -wxMenuItem *wxMenuBar::FindItemForId (int Id, wxMenu ** itemMenu) const +void wxMenu::SetFont(const wxFont& font) { - if (itemMenu) - *itemMenu = NULL; + m_font = font; + 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; +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); + + size_t menuCount = GetMenuCount(); + for (size_t i = 0; i < menuCount; i++) + m_menus.Item(i)->GetData()->SetBackgroundColour((wxColour&) col); + + return true; } -void wxMenuBar::SetHelpString (int Id, const wxString& helpString) +bool wxMenuBar::SetForegroundColour(const wxColour& col) { - int i; - for (i = 0; i < m_menuCount; i++) - { - if (m_menus[i]->FindItemForId (Id)) - { - m_menus[i]->SetHelpString (Id, helpString); - return; - } - } + if (!wxWindowBase::SetForegroundColour(col)) + return false; + if (!col.IsOk()) + return false; + if (m_mainWidget) + wxDoChangeForegroundColour(m_mainWidget, (wxColour&) col); + + size_t menuCount = GetMenuCount(); + for (size_t i = 0; i < menuCount; i++) + m_menus.Item(i)->GetData()->SetForegroundColour((wxColour&) col); + + return true; } -wxString wxMenuBar::GetHelpString (int Id) const +void wxMenuBar::ChangeFont(bool WXUNUSED(keepOriginalSize)) { - int i; - for (i = 0; i < m_menuCount; i++) - { - if (m_menus[i]->FindItemForId (Id)) - return wxString(m_menus[i]->GetHelpString (Id)); - } - return wxString(""); + // Nothing to do for menubar, fonts are kept in wxMenus } +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; +}