X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6d5b2a57cf08040457f7a3e80a0d76e8c954bfe5..ebb97a41da74f94885e67f502619dcd6a9f9d272:/src/msw/menuitem.cpp?ds=sidebyside diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp index 6d084e9d4d..e2063200cd 100644 --- a/src/msw/menuitem.cpp +++ b/src/msw/menuitem.cpp @@ -6,7 +6,7 @@ // Created: 11.11.97 // RCS-ID: $Id$ // Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows license +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // =========================================================================== @@ -17,7 +17,7 @@ // headers // --------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "menuitem.h" #endif @@ -28,6 +28,8 @@ #pragma hdrstop #endif +#if wxUSE_MENUS + #ifndef WX_PRECOMP #include "wx/font.h" #include "wx/bitmap.h" @@ -48,6 +50,11 @@ #include "wx/msw/private.h" +#ifdef __WXWINCE__ +// Implemented in menu.cpp +UINT GetMenuState(HMENU hMenu, UINT id, UINT flags) ; +#endif + // --------------------------------------------------------------------------- // macro // --------------------------------------------------------------------------- @@ -70,11 +77,48 @@ // dynamic classes implementation // ---------------------------------------------------------------------------- -#if wxUSE_OWNER_DRAWN - IMPLEMENT_DYNAMIC_CLASS2(wxMenuItem, wxMenuItemBase, wxOwnerDrawn) -#else //!USE_OWNER_DRAWN - IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxMenuItemBase) -#endif //USE_OWNER_DRAWN +#if wxUSE_EXTENDED_RTTI + +bool wxMenuItemStreamingCallback( const wxObject *object, wxWriter * , wxPersister * , wxxVariantArray & ) +{ + const wxMenuItem * mitem = dynamic_cast(object) ; + if ( mitem->GetMenu() && !mitem->GetMenu()->GetTitle().IsEmpty() ) + { + // we don't stream out the first two items for menus with a title, they will be reconstructed + if ( mitem->GetMenu()->FindItemByPosition(0) == mitem || mitem->GetMenu()->FindItemByPosition(1) == mitem ) + return false ; + } + return true ; +} + +wxBEGIN_ENUM( wxItemKind ) + wxENUM_MEMBER( wxITEM_SEPARATOR ) + wxENUM_MEMBER( wxITEM_NORMAL ) + wxENUM_MEMBER( wxITEM_CHECK ) + wxENUM_MEMBER( wxITEM_RADIO ) +wxEND_ENUM( wxItemKind ) + +IMPLEMENT_DYNAMIC_CLASS_XTI_CALLBACK(wxMenuItem, wxObject,"wx/menuitem.h",wxMenuItemStreamingCallback) + +wxBEGIN_PROPERTIES_TABLE(wxMenuItem) + wxPROPERTY( Parent,wxMenu*, SetMenu, GetMenu, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group") ) + wxPROPERTY( Id,int, SetId, GetId, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group") ) + wxPROPERTY( Text, wxString , SetText, GetText, wxString(), 0 /*flags*/ , wxT("Helpstring") , wxT("group") ) + wxPROPERTY( Help, wxString , SetHelp, GetHelp, wxString(), 0 /*flags*/ , wxT("Helpstring") , wxT("group") ) + wxREADONLY_PROPERTY( Kind, wxItemKind , GetKind , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group") ) + wxPROPERTY( SubMenu,wxMenu*, SetSubMenu, GetSubMenu, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group") ) + wxPROPERTY( Enabled , bool , Enable , IsEnabled , wxxVariant((bool)true) , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) + wxPROPERTY( Checked , bool , Check , IsChecked , wxxVariant((bool)false) , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) + wxPROPERTY( Checkable , bool , SetCheckable , IsCheckable , wxxVariant((bool)false) , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) +wxEND_PROPERTIES_TABLE() + +wxBEGIN_HANDLERS_TABLE(wxMenuItem) +wxEND_HANDLERS_TABLE() + +wxDIRECT_CONSTRUCTOR_6( wxMenuItem , wxMenu* , Parent , int , Id , wxString , Text , wxString , Help , wxItemKind , Kind , wxMenu* , SubMenu ) +#else +IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject) +#endif // ---------------------------------------------------------------------------- // wxMenuItem @@ -87,17 +131,39 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu, int id, const wxString& text, const wxString& strHelp, - bool bCheckable, + wxItemKind kind, wxMenu *pSubMenu) + : wxMenuItemBase(pParentMenu, id, text, strHelp, kind, pSubMenu) #if wxUSE_OWNER_DRAWN - : wxOwnerDrawn(GetLabelFromText(text), bCheckable) + , wxOwnerDrawn(text, kind == wxITEM_CHECK, true) #endif // owner drawn { - wxASSERT_MSG( pParentMenu != NULL, wxT("a menu item should have a parent") ); + Init(); +} + +wxMenuItem::wxMenuItem(wxMenu *parentMenu, + int id, + const wxString& text, + const wxString& help, + bool isCheckable, + wxMenu *subMenu) + : wxMenuItemBase(parentMenu, id, text, help, + isCheckable ? wxITEM_CHECK : wxITEM_NORMAL, subMenu) +#if wxUSE_OWNER_DRAWN + , wxOwnerDrawn(text, isCheckable, true) +#endif // owner drawn +{ + Init(); +} + +void wxMenuItem::Init() +{ + m_radioGroup.start = -1; + m_isRadioGroupStart = false; #if wxUSE_OWNER_DRAWN // set default menu colors - #define SYS_COLOR(c) (wxSystemSettings::GetSystemColour(wxSYS_COLOUR_##c)) + #define SYS_COLOR(c) (wxSystemSettings::GetColour(wxSYS_COLOUR_##c)) SetTextColour(SYS_COLOR(MENUTEXT)); SetBackgroundColour(SYS_COLOR(MENU)); @@ -108,17 +174,8 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu, ResetOwnerDrawn(); // tell the owner drawing code to to show the accel string as well - SetAccelString(text.AfterFirst(_T('\t'))); + SetAccelString(m_text.AfterFirst(_T('\t'))); #endif // wxUSE_OWNER_DRAWN - - m_parentMenu = pParentMenu; - m_subMenu = pSubMenu; - m_isEnabled = TRUE; - m_isChecked = FALSE; - m_id = id; - m_text = text; - m_isCheckable = bCheckable; - m_help = strHelp; } wxMenuItem::~wxMenuItem() @@ -139,6 +196,11 @@ int wxMenuItem::GetRealId() const bool wxMenuItem::IsChecked() const { + // fix that RTTI is always getting the correct state (separators cannot be checked, but the call below + // returns true + if ( GetId() == wxID_SEPARATOR ) + return false ; + int flag = ::GetMenuState(GetHMenuOf(m_parentMenu), GetId(), MF_BYCOMMAND); return (flag & MF_CHECKED) != 0; @@ -150,17 +212,29 @@ wxString wxMenuItemBase::GetLabelFromText(const wxString& text) return wxStripMenuCodes(text); } -// accelerators -// ------------ +// radio group stuff +// ----------------- -#if wxUSE_ACCEL +void wxMenuItem::SetAsRadioGroupStart() +{ + m_isRadioGroupStart = true; +} -wxAcceleratorEntry *wxMenuItem::GetAccel() const +void wxMenuItem::SetRadioGroupStart(int start) { - return wxGetAccelFromString(GetText()); + wxASSERT_MSG( !m_isRadioGroupStart, + _T("should only be called for the next radio items") ); + + m_radioGroup.start = start; } -#endif // wxUSE_ACCEL +void wxMenuItem::SetRadioGroupEnd(int end) +{ + wxASSERT_MSG( m_isRadioGroupStart, + _T("should only be called for the first radio item") ); + + m_radioGroup.end = end; +} // change item state // ----------------- @@ -184,18 +258,80 @@ void wxMenuItem::Enable(bool enable) void wxMenuItem::Check(bool check) { - wxCHECK_RET( m_isCheckable, wxT("only checkable items may be checked") ); + wxCHECK_RET( IsCheckable(), wxT("only checkable items may be checked") ); if ( m_isChecked == check ) return; - long rc = CheckMenuItem(GetHMenuOf(m_parentMenu), - GetRealId(), - MF_BYCOMMAND | - (check ? MF_CHECKED : MF_UNCHECKED)); + int flags = check ? MF_CHECKED : MF_UNCHECKED; + HMENU hmenu = GetHMenuOf(m_parentMenu); - if ( rc == -1 ) { - wxLogLastError(wxT("CheckMenuItem")); + if ( GetKind() == wxITEM_RADIO ) + { + // it doesn't make sense to uncheck a radio item - what would this do? + if ( !check ) + return; + + // get the index of this item in the menu + const wxMenuItemList& items = m_parentMenu->GetMenuItems(); + int pos = items.IndexOf(this); + wxCHECK_RET( pos != wxNOT_FOUND, + _T("menuitem not found in the menu items list?") ); + + // get the radio group range + int start, + end; + + if ( m_isRadioGroupStart ) + { + // we already have all information we need + start = pos; + end = m_radioGroup.end; + } + else // next radio group item + { + // get the radio group end from the start item + start = m_radioGroup.start; + end = items.Item(start)->GetData()->m_radioGroup.end; + } + +#ifdef __WIN32__ + // calling CheckMenuRadioItem() with such parameters hangs my system + // (NT4 SP6) and I suspect this could happen to the others as well - so + // don't do it! + wxCHECK_RET( start != -1 && end != -1, + _T("invalid ::CheckMenuRadioItem() parameter(s)") ); + + if ( !::CheckMenuRadioItem(hmenu, + start, // the first radio group item + end, // the last one + pos, // the one to check + MF_BYPOSITION) ) + { + wxLogLastError(_T("CheckMenuRadioItem")); + } +#endif // __WIN32__ + + // also uncheck all the other items in this radio group + wxMenuItemList::compatibility_iterator node = items.Item(start); + for ( int n = start; n <= end && node; n++ ) + { + if ( n != pos ) + { + node->GetData()->m_isChecked = false; + } + + node = node->GetNext(); + } + } + else // check item + { + if ( ::CheckMenuItem(hmenu, + GetRealId(), + MF_BYCOMMAND | flags) == (DWORD)-1 ) + { + wxFAIL_MSG( _T("CheckMenuItem() failed, item not in the menu?") ); + } } wxMenuItemBase::Check(check); @@ -209,6 +345,10 @@ void wxMenuItem::SetText(const wxString& text) wxMenuItemBase::SetText(text); OWNER_DRAWN_ONLY( wxOwnerDrawn::SetName(text) ); +#if wxUSE_OWNER_DRAWN + // tell the owner drawing code to to show the accel string as well + SetAccelString(text.AfterFirst(_T('\t'))); +#endif HMENU hMenu = GetHMenuOf(m_parentMenu); wxCHECK_RET( hMenu, wxT("menuitem without menu") ); @@ -221,7 +361,8 @@ void wxMenuItem::SetText(const wxString& text) UINT flagsOld = ::GetMenuState(hMenu, id, MF_BYCOMMAND); if ( flagsOld == 0xFFFFFFFF ) { - wxLogLastError(wxT("GetMenuState")); + // It's not an error, it means that the menu item doesn't exist + //wxLogLastError(wxT("GetMenuState")); } else { @@ -247,12 +388,31 @@ void wxMenuItem::SetText(const wxString& text) data = (wxChar*) text.c_str(); } +#ifdef __WXWINCE__ + // FIXME: complete this, applying the old + // flags. + // However, the WinCE doc for SetMenuItemInfo + // says that you can't use it to set the menu + // item state; only data, id and type. + MENUITEMINFO info; + wxZeroMemory(info); + info.cbSize = sizeof(info); + info.fMask = MIIM_TYPE; + info.fType = MFT_STRING; + info.cch = text.Length(); + info.dwTypeData = (LPTSTR) data ; + if ( !::SetMenuItemInfo(hMenu, id, FALSE, & info) ) + { + wxLogLastError(wxT("SetMenuItemInfo")); + } +#else if ( ::ModifyMenu(hMenu, id, MF_BYCOMMAND | flagsOld, id, data) == (int)0xFFFFFFFF ) { wxLogLastError(wxT("ModifyMenu")); } +#endif } } @@ -270,8 +430,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); } + +#endif // wxUSE_MENUS