X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/51c9a5db64e3df86e17d5ba4779782db677fdf15..12bb29f5432174ecbd65549bda832d70d34a98ae:/src/motif/menuitem.cpp diff --git a/src/motif/menuitem.cpp b/src/motif/menuitem.cpp index c680eaeaad..76b337eb4c 100644 --- a/src/motif/menuitem.cpp +++ b/src/motif/menuitem.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: menuitem.cpp +// Name: src/motif/menuitem.cpp // Purpose: wxMenuItem implementation // Author: Julian Smart // Modified by: @@ -20,12 +20,14 @@ // 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/utils.h" -#include "wx/frame.h" +#include "wx/stockitem.h" + +#ifndef WX_PRECOMP + #include "wx/utils.h" + #include "wx/frame.h" + #include "wx/menu.h" +#endif #ifdef __VMS__ #pragma message disable nosimpint @@ -61,8 +63,6 @@ static void wxMenuItemDisarmCallback(Widget w, XtPointer clientData, XtPointer p // dynamic classes implementation // ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject) - // ---------------------------------------------------------------------------- // wxMenuItem // ---------------------------------------------------------------------------- @@ -134,12 +134,6 @@ void wxMenuItem::Check(bool bDoCheck) } } -/* static */ -wxString wxMenuItemBase::GetLabelFromText(const wxString& text) -{ - return wxStripMenuCodes(text); -} - // ---------------------------------------------------------------------------- // wxMenuItemBase // ---------------------------------------------------------------------------- @@ -171,9 +165,17 @@ void wxMenuItem::CreateItem (WXWidget menu, wxMenuBar * menuBar, (wxStripMenuCodes(m_text), xmLabelGadgetClass, (Widget) menu, NULL); } - else if ((!m_text.IsNull() && m_text != "") && (!m_subMenu)) + else if (!IsSeparator() && !m_subMenu) { - wxString strName = wxStripMenuCodes(m_text); + wxString txt = m_text; + + if (m_text.IsEmpty()) + { + wxASSERT_MSG(wxIsStockID(GetId()), wxT("A non-stock menu item with an empty label?")); + txt = wxGetStockLabel(GetId(), wxSTOCK_WITH_ACCELERATOR|wxSTOCK_WITH_MNEMONIC); + } + + wxString strName = wxStripMenuCodes(txt); if (IsCheckable()) { m_buttonWidget = (WXWidget) XtVaCreateManagedWidget (strName, @@ -229,7 +231,7 @@ void wxMenuItem::CreateItem (WXWidget menu, wxMenuBar * menuBar, (XtCallbackProc) wxMenuItemDisarmCallback, (XtPointer) this); } - else if (GetId() == wxID_SEPARATOR) + else if (IsSeparator()) { m_buttonWidget = (WXWidget) XtVaCreateManagedWidget ("separator", xmSeparatorGadgetClass, (Widget) menu, @@ -258,7 +260,7 @@ void wxMenuItem::DestroyItem(bool full) ; // Nothing } - else if ((!m_text.IsNull() && (m_text != "")) && !m_subMenu) + else if (!m_text.empty() && !m_subMenu) { if (m_buttonWidget) { @@ -274,7 +276,7 @@ void wxMenuItem::DestroyItem(bool full) wxMenuItemDisarmCallback, (XtPointer) this); } } - else if (GetId() == wxID_SEPARATOR) + else if (IsSeparator()) { ; // Nothing @@ -298,7 +300,7 @@ void wxMenuItem::DestroyItem(bool full) } } -void wxMenuItem::SetText(const wxString& label) +void wxMenuItem::SetItemLabel(const wxString& label) { char mnem = wxFindMnemonic (label); wxString label2 = wxStripMenuCodes(label); @@ -336,7 +338,7 @@ void wxMenuItemCallback (Widget WXUNUSED(w), XtPointer clientData, wxMenuItem *item = (wxMenuItem *) clientData; if (item) { - wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED, item->GetId()); + wxCommandEvent event(wxEVT_MENU, item->GetId()); event.SetInt( item->GetId() ); if (item->IsCheckable()) @@ -356,7 +358,7 @@ void wxMenuItemCallback (Widget WXUNUSED(w), XtPointer clientData, event.SetEventObject(item->GetMenuBar()->GetMenuBarFrame()); item->GetMenuBar()->GetMenuBarFrame() - ->GetEventHandler()->ProcessEvent(event); + ->HandleWindowEvent(event); } // this is the child of a popup menu else if (item->GetTopMenu()) @@ -388,7 +390,7 @@ void wxMenuItemArmCallback (Widget WXUNUSED(w), XtPointer clientData, menuEvent.SetEventObject(item->GetMenuBar()->GetMenuBarFrame()); item->GetMenuBar()->GetMenuBarFrame() - ->GetEventHandler()->ProcessEvent(menuEvent); + ->HandleWindowEvent(menuEvent); } } } @@ -408,8 +410,7 @@ wxMenuItemDisarmCallback (Widget WXUNUSED(w), XtPointer clientData, menuEvent.SetEventObject(item->GetMenuBar()->GetMenuBarFrame()); item->GetMenuBar()->GetMenuBarFrame() - ->GetEventHandler()->ProcessEvent(menuEvent); + ->HandleWindowEvent(menuEvent); } } } -