X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c71830c3b63568566cf5f006165e51ffaee0c704..53701799b4f51179f9d1ebdc9afc0a1922a36974:/src/motif/menuitem.cpp diff --git a/src/motif/menuitem.cpp b/src/motif/menuitem.cpp index 2bd43ebf94..b77709f6d6 100644 --- a/src/motif/menuitem.cpp +++ b/src/motif/menuitem.cpp @@ -13,7 +13,7 @@ // declarations // ============================================================================ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "menuitem.h" #endif @@ -21,11 +21,19 @@ // 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/utils.h" #include "wx/frame.h" +#ifdef __VMS__ +#pragma message disable nosimpint +#endif #include #include #include @@ -35,6 +43,9 @@ #include #include #include +#ifdef __VMS__ +#pragma message enable nosimpint +#endif #include "wx/motif/private.h" @@ -54,9 +65,7 @@ static void wxMenuItemDisarmCallback(Widget w, XtPointer clientData, XtPointer p // dynamic classes implementation // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY - IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject) -#endif //USE_SHARED_LIBRARY +IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject) // ---------------------------------------------------------------------------- // wxMenuItem @@ -65,23 +74,14 @@ static void wxMenuItemDisarmCallback(Widget w, XtPointer clientData, XtPointer p // ctor & dtor // ----------- -wxMenuItem::wxMenuItem(wxMenu *pParentMenu, int id, - const wxString& strName, const wxString& strHelp, - bool bCheckable, +wxMenuItem::wxMenuItem(wxMenu *pParentMenu, + int id, + const wxString& strName, + const wxString& strHelp, + wxItemKind kind, wxMenu *pSubMenu) + : wxMenuItemBase(pParentMenu, id, strName, strHelp, kind, pSubMenu) { - wxASSERT_MSG( pParentMenu != NULL, wxT("menuitem should have a menu") ); - - // common init - m_parentMenu = pParentMenu; - m_subMenu = pSubMenu; - m_id = id; - m_isEnabled = TRUE; - m_isChecked = FALSE; - m_help = strHelp; - m_isCheckable = bCheckable; - m_text = strName; - // Motif-specific m_menuBar = NULL; m_buttonWidget = (WXWidget) NULL; @@ -92,24 +92,12 @@ wxMenuItem::~wxMenuItem() { } -// misc -// ---- - -// delete the sub menu -void wxMenuItem::DeleteSubMenu() -{ - wxASSERT( m_subMenu != NULL ); - - delete m_subMenu; - m_subMenu = NULL; -} - // change item state // ----------------- void wxMenuItem::Enable(bool bDoEnable) { - if ( m_isChecked != bDoEnable ) + if ( m_isEnabled != bDoEnable ) { if ( !IsSubMenu() ) { @@ -150,12 +138,12 @@ void wxMenuItem::Check(bool bDoCheck) } } -wxString wxMenuItem::GetLabel() const +/* static */ +wxString wxMenuItemBase::GetLabelFromText(const wxString& text) { - return wxStripMenuCodes(m_text); + return wxStripMenuCodes(text); } - // ---------------------------------------------------------------------------- // wxMenuItemBase // ---------------------------------------------------------------------------- @@ -164,10 +152,10 @@ wxMenuItem *wxMenuItemBase::New(wxMenu *parentMenu, int id, const wxString& name, const wxString& help, - bool isCheckable, + wxItemKind kind, wxMenu *subMenu) { - return new wxMenuItem(parentMenu, id, name, help, isCheckable, subMenu); + return new wxMenuItem(parentMenu, id, name, help, kind, subMenu); } // ---------------------------------------------------------------------------- @@ -179,9 +167,9 @@ void wxMenuItem::CreateItem (WXWidget menu, wxMenuBar * menuBar, wxMenu * topMen m_menuBar = menuBar; m_topMenu = topMenu; - if (GetId() == -2) + if (GetId() == -3) { - // Id=-2 identifies a Title item. + // Id=-3 identifies a Title item. m_buttonWidget = (WXWidget) XtVaCreateManagedWidget (wxStripMenuCodes(m_text), xmLabelGadgetClass, (Widget) menu, NULL); @@ -238,7 +226,7 @@ void wxMenuItem::CreateItem (WXWidget menu, wxMenuBar * menuBar, wxMenu * topMen (XtCallbackProc) wxMenuItemDisarmCallback, (XtPointer) this); } - else if (GetId() == -1) + else if (GetId() == wxID_SEPARATOR) { m_buttonWidget = (WXWidget) XtVaCreateManagedWidget ("separator", xmSeparatorGadgetClass, (Widget) menu, NULL); @@ -258,7 +246,7 @@ void wxMenuItem::CreateItem (WXWidget menu, wxMenuBar * menuBar, wxMenu * topMen void wxMenuItem::DestroyItem(bool full) { - if (GetId() == -2) + if (GetId() == -3) { ; // Nothing @@ -279,7 +267,7 @@ void wxMenuItem::DestroyItem(bool full) wxMenuItemDisarmCallback, (XtPointer) this); } } - else if (GetId() == -1) + else if (GetId() == wxID_SEPARATOR) { ; // Nothing @@ -314,7 +302,7 @@ void wxMenuItem::SetText(const wxString& label) { wxXmString label_str(label2); XtVaSetValues ((Widget) m_buttonWidget, - XmNlabelString, label_str, + XmNlabelString, label_str(), NULL); if (mnem != 0) XtVaSetValues ((Widget) m_buttonWidget, XmNmnemonic, mnem, NULL); @@ -341,29 +329,42 @@ void wxMenuItemCallback (Widget WXUNUSED(w), XtPointer clientData, wxMenuItem *item = (wxMenuItem *) clientData; if (item) { + wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED, item->GetId()); + event.SetInt( item->GetId() ); + if (item->IsCheckable()) { Boolean isChecked = FALSE; - XtVaGetValues ((Widget) item->GetButtonWidget(), XmNset, & isChecked, NULL); + XtVaGetValues ((Widget) item->GetButtonWidget(), + XmNset, & isChecked, + NULL); // only set the flag, don't actually check anything item->wxMenuItemBase::Check(isChecked); + event.SetInt(isChecked); } + if (item->GetMenuBar() && item->GetMenuBar()->GetMenuBarFrame()) { - wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, item->GetId()); - commandEvent.SetEventObject(item->GetMenuBar()->GetMenuBarFrame()); - commandEvent.SetInt( item->GetId() ); + event.SetEventObject(item->GetMenuBar()->GetMenuBarFrame()); - item->GetMenuBar()->GetMenuBarFrame()->GetEventHandler()->ProcessEvent(commandEvent); + item->GetMenuBar()->GetMenuBarFrame() + ->GetEventHandler()->ProcessEvent(event); } + // this is the child of a popup menu else if (item->GetTopMenu()) { - wxCommandEvent event (wxEVT_COMMAND_MENU_SELECTED, item->GetId()); event.SetEventObject(item->GetTopMenu()); - event.SetInt( item->GetId() ); item->GetTopMenu()->ProcessCommand (event); + + // Since PopupMenu under Motif still grab right mouse + // button events after it was closed, we need to delete + // the associated widgets to allow next PopUpMenu to + // appear; this needs to be done there because doing it in + // a WorkProc as before may cause crashes if a menu item causes + // the parent window of the menu to be destroyed + item->GetTopMenu()->DestroyWidgetAndDetach(); } } } @@ -379,7 +380,8 @@ void wxMenuItemArmCallback (Widget WXUNUSED(w), XtPointer clientData, wxMenuEvent menuEvent(wxEVT_MENU_HIGHLIGHT, item->GetId()); menuEvent.SetEventObject(item->GetMenuBar()->GetMenuBarFrame()); - item->GetMenuBar()->GetMenuBarFrame()->GetEventHandler()->ProcessEvent(menuEvent); + item->GetMenuBar()->GetMenuBarFrame() + ->GetEventHandler()->ProcessEvent(menuEvent); } } } @@ -398,7 +400,8 @@ wxMenuItemDisarmCallback (Widget WXUNUSED(w), XtPointer clientData, wxMenuEvent menuEvent(wxEVT_MENU_HIGHLIGHT, -1); menuEvent.SetEventObject(item->GetMenuBar()->GetMenuBarFrame()); - item->GetMenuBar()->GetMenuBarFrame()->GetEventHandler()->ProcessEvent(menuEvent); + item->GetMenuBar()->GetMenuBarFrame() + ->GetEventHandler()->ProcessEvent(menuEvent); } } }