X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/193fe9890411e788f41648b95280d8979b378189..dde4740fe1dddbb2738a0afd054f493cb0dd67d1:/src/motif/menu.cpp?ds=sidebyside diff --git a/src/motif/menu.cpp b/src/motif/menu.cpp index ed12ce6732..c2d975ae6e 100644 --- a/src/motif/menu.cpp +++ b/src/motif/menu.cpp @@ -11,17 +11,22 @@ // ============================================================================ -// headers & declarations +// declarations // ============================================================================ -// wxWindows headers -// ----------------- - -#ifdef __GNUG__ -#pragma implementation "menu.h" -#pragma implementation "menuitem.h" +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) + #pragma implementation "menu.h" #endif +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#include "wx/defs.h" + #include "wx/menu.h" #include "wx/menuitem.h" #include "wx/log.h" @@ -30,6 +35,11 @@ #include "wx/frame.h" #include "wx/settings.h" +#ifdef __VMS__ +#pragma message disable nosimpint +#define XtDisplay XTDISPLAY +#define XtWindow XTWINDOW +#endif #include #include #include @@ -39,63 +49,47 @@ #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) -void wxMenu::Init(const wxString& title, - long style -#ifdef WXWIN_COMPATIBILITY - , const wxFunction func -#endif - ) +void wxMenu::Init() { - m_title = title; - m_parent = (wxEvtHandler*) NULL; - m_eventHandler = this; - m_noItems = 0; - m_menuBar = NULL; - m_pInvokingWindow = NULL; - m_style = style; - - //// 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; + m_ownedByMenuBar = false; - if (m_title != "") + if ( !!m_title ) { - 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); -#ifdef WXWIN_COMPATIBILITY - Callback(func); -#endif + m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_MENU); + m_foregroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_MENUTEXT); + m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); } // The wxWindow destructor will take care of deleting the submenus. @@ -104,9 +98,9 @@ wxMenu::~wxMenu() if (m_menuWidget) { if (m_menuParent) - DestroyMenu(TRUE); + DestroyMenu(true); else - DestroyMenu(FALSE); + DestroyMenu(false); } // Not sure if this is right @@ -115,273 +109,78 @@ wxMenu::~wxMenu() 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)); -} - -// 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) -{ - Append(new wxMenuItem(this, id, label, helpString, FALSE, subMenu)); - - subMenu->m_topLevelMenu = m_topLevelMenu; -} - -// 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)); -} - -void wxMenu::Delete(int id) -{ - wxNode *node; - wxMenuItem *item; - int pos; - - for (pos = 0, node = m_menuItems.First(); node; node = node->Next(), pos++) { - item = (wxMenuItem *)node->Data(); - if (item->GetId() == id) - break; + // this is a dynamic Append + pItem->CreateItem(m_menuWidget, GetMenuBar(), m_topLevelMenu); } - 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()); + if ( pItem->IsSubMenu() ) + { + pItem->GetSubMenu()->m_topLevelMenu = m_topLevelMenu; } - */ - - 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); + return wxMenuBase::DoAppend(pItem); } -bool wxMenu::Enabled(int Id) const +wxMenuItem *wxMenu::DoRemove(wxMenuItem *item) { - wxMenuItem *item = FindItemForId(Id); - wxCHECK( item != NULL, FALSE ); + item->DestroyItem(true); - return item->IsEnabled(); + return wxMenuBase::DoRemove(item); } -void wxMenu::Check(int Id, bool Flag) +wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item) { - wxMenuItem *item = FindItemForId(Id); - wxCHECK_RET( item != NULL, "can't get status of non-existing menu item" ); + if ( wxMenuBase::DoInsert(pos, item) ) + return item; - item->Check(Flag); -} + wxFAIL_MSG(wxT("DoInsert not implemented; or error in wxMenuBase::DoInsert")); -bool wxMenu::Checked(int id) const -{ - wxMenuItem *item = FindItemForId(id); - wxCHECK( item != NULL, FALSE ); - - return item->IsChecked(); + return NULL; } void wxMenu::SetTitle(const wxString& label) { - m_title = label ; + m_title = label; - wxNode *node = m_menuItems.First (); - if (!node) + 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) + 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; -} - -void wxMenu::SetLabel(int id, const wxString& label) -{ - wxMenuItem *item = FindItemForId(id); - if (item == (wxMenuItem*) NULL) - 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; -} - -void wxMenu::SetHelpString(int itemId, const wxString& helpString) -{ - wxMenuItem *item = FindItemForId (itemId); - if (item) - item->SetHelp(helpString); -} - -wxString wxMenu::GetHelpString (int itemId) const -{ - wxMenuItem *item = FindItemForId (itemId); - wxString str(""); - return (item == NULL) ? str : item->GetHelp(); -} - -void wxMenu::ProcessCommand(wxCommandEvent & event) -{ - bool processed = FALSE; + bool processed = false; +#if wxUSE_MENU_CALLBACK // Try a callback if (m_callback) { (void) (*(m_callback)) (*this, event); - processed = TRUE; + processed = true; } +#endif // wxUSE_MENU_CALLBACK // Try the menu's event handler if ( !processed && GetEventHandler()) @@ -391,313 +190,147 @@ void wxMenu::ProcessCommand(wxCommandEvent & event) // Try the window the menu was popped up from (and up // through the hierarchy) if ( !processed && GetInvokingWindow()) - processed = GetInvokingWindow()->ProcessEvent(event); -} + processed = GetInvokingWindow()->ProcessEvent(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(); - } + 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); + m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_MENU); + m_foregroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_MENUTEXT); + m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); } -wxMenuBar::wxMenuBar(int n, wxMenu *menus[], const wxString titles[]) -{ - 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); -} - -wxMenuBar::~wxMenuBar() +wxMenuBar::wxMenuBar(size_t n, wxMenu *menus[], const wxArrayString& titles, long WXUNUSED(style)) { - int i; - for (i = 0; i < m_menuCount; i++) - { - delete m_menus[i]; - } - delete[] m_menus; - delete[] m_titles; -} + wxASSERT( size_t(n) == titles.GetCount() ); -// 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); -} + Init(); -void wxMenuBar::EnableTop(int pos, bool flag) -{ - // TODO + m_titles = titles; + for ( int i = 0; i < n; i++ ) + m_menus.Append(menus[i]); } -// Must only be used AFTER menu has been attached to frame, -// otherwise use individual menus -void wxMenuBar::Check(int id, bool flag) +wxMenuBar::wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long WXUNUSED(style)) { - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(id, &itemMenu) ; - if (!item) - return; - - if (!item->IsCheckable()) - return ; + Init(); - item->Check(flag); + for ( size_t i = 0; i < n; i++ ) + { + m_menus.Append(menus[i]); + m_titles.Add(titles[i]); + } } -bool wxMenuBar::Checked(int id) const +wxMenuBar::~wxMenuBar() { - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(id, &itemMenu) ; - if (!item) - return FALSE; - - return item->IsChecked(); + // nothing to do: wxMenuBarBase will delete the menus } -bool wxMenuBar::Enabled(int id) const +void wxMenuBar::EnableTop(size_t WXUNUSED(pos), bool WXUNUSED(flag)) { - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(id, &itemMenu) ; - if (!item) - return FALSE; - - return item->IsEnabled(); + // wxFAIL_MSG("TODO"); +// wxLogWarning("wxMenuBar::EnableTop not yet implemented."); } -void wxMenuBar::SetLabel(int id, const wxString& label) +void wxMenuBar::SetLabelTop(size_t pos, const wxString& label) { - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(id, &itemMenu) ; - - if (!item) + wxMenu *menu = GetMenu(pos); + if ( !menu ) return; - item->SetLabel(label); -} - -wxString wxMenuBar::GetLabel(int id) const -{ - wxMenu *itemMenu = NULL; - wxMenuItem *item = FindItemForId(id, &itemMenu) ; - - if (!item) - return wxString(""); - - return item->GetLabel(); -} - -void wxMenuBar::SetLabelTop(int pos, const wxString& label) -{ - wxASSERT( (pos < m_menuCount) ); - - Widget w = (Widget) m_menus[pos]->GetButtonWidget(); + Widget w = (Widget)menu->GetButtonWidget(); if (w) { - XmString label_str = XmStringCreateSimple ((char*) (const char*) label); - XtVaSetValues (w, - XmNlabelString, label_str, - NULL); - XmStringFree (label_str); + wxXmString label_str(label); + + XtVaSetValues(w, + XmNlabelString, label_str(), + NULL); } } -wxString wxMenuBar::GetLabelTop(int pos) const +wxString wxMenuBar::GetLabelTop(size_t pos) const { - wxASSERT( (pos < m_menuCount) ); - - Widget w = (Widget) m_menus[pos]->GetButtonWidget(); - if (w) + wxMenu *menu = GetMenu(pos); + if ( menu ) { - XmString text; - char *s; - XtVaGetValues (w, - XmNlabelString, &text, - NULL); - - if (XmStringGetLtoR (text, XmSTRING_DEFAULT_CHARSET, &s)) + Widget w = (Widget)menu->GetButtonWidget(); + if (w) { - wxString str(s); - XtFree (s); - return str; - } - else - { - return wxEmptyString; + XmString text; + XtVaGetValues(w, + XmNlabelString, &text, + NULL); + + return wxXmStringToString( text ); } } - else - return wxEmptyString; + return wxEmptyString; } -bool wxMenuBar::OnDelete(wxMenu *menu, int pos) +bool wxMenuBar::Append(wxMenu * menu, const wxString& title) { - // Only applies to dynamic deletion (when set in frame) - if (!m_menuBarFrame) - return TRUE; + wxCHECK_MSG( menu, false, wxT("invalid menu") ); + wxCHECK_MSG( !menu->GetParent() && !menu->GetButtonWidget(), false, + wxT("menu already appended") ); - menu->DestroyMenu(TRUE); - return TRUE; -} + if ( m_menuBarFrame ) + { + WXWidget w = menu->CreateMenu(this, GetMainWidget(), menu, title, true); + wxCHECK_MSG( w, false, wxT("failed to create menu") ); + menu->SetButtonWidget(w); + } -bool wxMenuBar::OnAppend(wxMenu *menu, const char *title) -{ - // Only applies to dynamic append (when set in frame) - if (!m_menuBarFrame) - return TRUE; + m_titles.Add(title); - // Probably should be an assert here - if (menu->GetParent()) - return FALSE; + return wxMenuBarBase::Append(menu, title); +} - // Has already been appended - if (menu->GetButtonWidget()) - return FALSE; +bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title) +{ + if ( !wxMenuBarBase::Insert(pos, menu, title) ) + return false; - WXWidget w = menu->CreateMenu(this, GetMainWidget(), menu, title, TRUE); - menu->SetButtonWidget(w); + wxFAIL_MSG(wxT("TODO")); - return TRUE; + return false; } -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; + if ( !wxMenuBarBase::Replace(pos, menu, title) ) + return NULL; - m_menus[m_menuCount - 1] = (wxMenu *)menu; - m_titles[m_menuCount - 1] = title; + wxFAIL_MSG(wxT("TODO")); - menu->SetMenuBar(this); - menu->SetParent(this); + return NULL; } -void wxMenuBar::Delete(wxMenu * menu, int i) +wxMenu *wxMenuBar::Remove(size_t pos) { - int j; - int ii = (int) i; + wxMenu *menu = wxMenuBarBase::Remove(pos); + if ( !menu ) + return NULL; - 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 ( m_menuBarFrame ) + menu->DestroyMenu(true); - if (!OnDelete(menu, ii)) - return; + menu->SetMenuBar(NULL); - menu->SetParent((wxEvtHandler*) NULL); + m_titles.RemoveAt(pos); - -- m_menuCount; - for (j = ii; j < m_menuCount; j++) - { - m_menus[j] = m_menus[j + 1]; - m_titles[j] = m_titles[j + 1]; - } + return menu; } // Find the menu menuString, item itemString, and return the item id. @@ -706,77 +339,54 @@ int wxMenuBar::FindMenuItem (const wxString& menuString, const wxString& itemStr { char buf1[200]; char buf2[200]; - wxStripMenuCodes ((char *)(const char *)menuString, buf1); - int i; - for (i = 0; i < m_menuCount; i++) + wxStripMenuCodes (wxConstCast(menuString.c_str(), char), buf1); + + size_t menuCount = GetMenuCount(); + for (size_t i = 0; i < menuCount; i++) { - wxStripMenuCodes ((char *)(const char *)m_titles[i], buf2); + wxStripMenuCodes (wxConstCast(m_titles[i].c_str(), char), buf2); if (strcmp (buf1, buf2) == 0) - return m_menus[i]->FindItem (itemString); + return m_menus.Item(i)->GetData()->FindItem (itemString); } return -1; } -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))) + size_t menuCount = GetMenuCount(); + for (size_t i = 0; i < menuCount; i++) + if ((item = m_menus.Item(i)->GetData()->FindItem(id, itemMenu))) return item; return NULL; } -void wxMenuBar::SetHelpString (int id, const wxString& helpString) -{ - int i; - for (i = 0; i < m_menuCount; i++) - { - if (m_menus[i]->FindItemForId (id)) - { - m_menus[i]->SetHelpString (id, helpString); - return; - } - } -} - -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(""); -} - // Create menubar bool wxMenuBar::CreateMenuBar(wxFrame* parent) { 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(), "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)); + menu->SetButtonWidget(menu->CreateMenu (this, menuBarW, menu, title, true)); if (strcmp (wxStripMenuCodes(title), "Help") == 0) XtVaSetValues ((Widget) menuBarW, XmNmenuHelpWidget, (Widget) menu->GetButtonWidget(), NULL); @@ -788,6 +398,9 @@ bool wxMenuBar::CreateMenuBar(wxFrame* parent) 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 } } @@ -796,12 +409,12 @@ bool wxMenuBar::CreateMenuBar(wxFrame* parent) SetForegroundColour(m_foregroundColour); SetFont(m_font); - XtVaSetValues((Widget) parent->GetMainWindowWidget(), XmNmenuBar, (Widget) m_mainWidget, NULL); + 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. @@ -810,17 +423,17 @@ bool wxMenuBar::DestroyMenuBar() if (!m_mainWidget) { SetMenuBarFrame((wxFrame*) NULL); - return FALSE; + 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); @@ -828,55 +441,39 @@ bool wxMenuBar::DestroyMenuBar() SetMenuBarFrame((wxFrame*) NULL); - return TRUE; + return true; } -//// Motif-specific - -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... -*/ - -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; } /* @@ -891,21 +488,21 @@ WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar, WXWidget parent, wxMenu * topM Widget buttonWidget = (Widget) 0; Arg args[5]; XtSetArg (args[0], XmNnumColumns, m_numColumns); - XtSetArg (args[1], XmNpacking, XmPACK_COLUMN); + XtSetArg (args[1], XmNpacking, (m_numColumns > 1) ? XmPACK_COLUMN : XmPACK_TIGHT); if (!pullDown) { menu = XmCreatePopupMenu ((Widget) parent, "popup", args, 2); +#if 0 XtAddCallback(menu, XmNunmapCallback, (XtCallbackProc)wxMenuPopdownCallback, (XtPointer)this); +#endif } else { char mnem = wxFindMnemonic (title); - wxStripMenuCodes ((char*) (const char*) title, wxBuffer); - menu = XmCreatePulldownMenu ((Widget) parent, "pulldown", args, 2); wxString title2(wxStripMenuCodes(title)); @@ -926,13 +523,15 @@ WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar, WXWidget parent, wxMenu * topM m_menuWidget = (WXWidget) menu; - m_menuBar = menuBar; m_topLevelMenu = topMenu; - 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->CreateItem (menu, menuBar, topMenu); + wxMenuItem *item = node->GetData(); + + item->CreateItem(menu, menuBar, topMenu); } SetBackgroundColour(m_backgroundColour); @@ -943,17 +542,19 @@ WXWidget wxMenu::CreateMenu (wxMenuBar * menuBar, WXWidget parent, wxMenu * topM } // Destroys the Motif implementation of the menu, -// but maintains the wxWindows data structures so we can +// but maintains the wxWidgets data structures so we can // do a CreateMenu again. void wxMenu::DestroyMenu (bool full) { - for (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(); item->SetMenuBar((wxMenuBar*) NULL); item->DestroyItem(full); - }// for() + } if (m_buttonWidget) { @@ -980,9 +581,11 @@ WXWidget wxMenu::FindMenuItem (int id, wxMenuItem ** it) const 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) @@ -998,7 +601,7 @@ WXWidget wxMenu::FindMenuItem (int id, wxMenuItem ** it) const return w; } } - }// for() + } if (it) *it = (wxMenuItem*) NULL; @@ -1011,20 +614,20 @@ void wxMenu::SetBackgroundColour(const wxColour& col) if (m_menuWidget) wxDoChangeBackgroundColour(m_menuWidget, (wxColour&) col); if (m_buttonWidget) - wxDoChangeBackgroundColour(m_buttonWidget, (wxColour&) col, TRUE); + wxDoChangeBackgroundColour(m_buttonWidget, (wxColour&) col, true); - 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 - // wxDoChangeBackgroundColour(item->GetButtonWidget(), (wxColour&) col, TRUE); + // wxDoChangeBackgroundColour(item->GetButtonWidget(), (wxColour&) col, true); } if (item->GetSubMenu()) item->GetSubMenu()->SetBackgroundColour((wxColour&) col); - node = node->Next(); } } @@ -1036,10 +639,11 @@ void wxMenu::SetForegroundColour(const 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 @@ -1047,41 +651,41 @@ 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 + // Lesstif 0.87 hangs here, but 0.93 does not +#if !wxCHECK_LESSTIF() || wxCHECK_LESSTIF_VERSION( 0, 93 ) if (!m_font.Ok() || !m_menuWidget) return; - XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay((Widget) m_menuWidget)); + WXFontType fontType = m_font.GetFontType(XtDisplay((Widget) m_menuWidget)); XtVaSetValues ((Widget) m_menuWidget, - XmNfontList, fontList, - NULL); + wxFont::GetFontTag(), fontType, + NULL); if (m_buttonWidget) { XtVaSetValues ((Widget) m_buttonWidget, - XmNfontList, fontList, - NULL); + wxFont::GetFontTag(), fontType, + NULL); } - 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 (m_menuWidget && item->GetButtonWidget() && m_font.Ok()) { XtVaSetValues ((Widget) item->GetButtonWidget(), - XmNfontList, fontList, - NULL); + wxFont::GetFontTag(), fontType, + NULL); } if (item->GetSubMenu()) item->GetSubMenu()->ChangeFont(keepOriginalSize); - node = node->Next(); } #endif } @@ -1092,40 +696,46 @@ void wxMenu::SetFont(const wxFont& font) ChangeFont(); } -void wxMenuBar::SetBackgroundColour(const wxColour& col) +bool wxMenuBar::SetBackgroundColour(const wxColour& col) { - m_backgroundColour = col; 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 (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; }