X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0472ece753aa3c018dd2cc9816d3cd755f28efe8..2d1715aa46b210e69ddf2dd1cd1c7d2f23c4298a:/src/msw/menuitem.cpp diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp index 2cabd2c1f2..4a17c4579b 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 @@ -50,6 +50,11 @@ #include "wx/msw/private.h" +#ifdef __WXWINCE__ +// Implemented in menu.cpp +UINT GetMenuState(HMENU hMenu, UINT id, UINT flags) ; +#endif + // --------------------------------------------------------------------------- // macro // --------------------------------------------------------------------------- @@ -72,7 +77,48 @@ // dynamic classes implementation // ---------------------------------------------------------------------------- +#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, , 0 /*flags*/ , wxT("Helpstring") , wxT("group") ) + wxPROPERTY( Id,int, SetId, GetId, , 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 , , 0 /*flags*/ , wxT("Helpstring") , wxT("group") ) + wxPROPERTY( SubMenu,wxMenu*, SetSubMenu, GetSubMenu, , 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 @@ -89,13 +135,31 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu, wxMenu *pSubMenu) : wxMenuItemBase(pParentMenu, id, text, strHelp, kind, pSubMenu) #if wxUSE_OWNER_DRAWN - , wxOwnerDrawn(GetLabelFromText(text), kind == wxItem_Check) + , wxOwnerDrawn(text, kind == wxITEM_CHECK, true) +#endif // owner drawn +{ + 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 { - wxASSERT_MSG( pParentMenu != NULL, wxT("a menu item should have a parent") ); + Init(); +} - m_startRadioGroup = - m_endRadioGroup = -1; +void wxMenuItem::Init() +{ + m_radioGroup.start = -1; + m_isRadioGroupStart = FALSE; #if wxUSE_OWNER_DRAWN // set default menu colors @@ -110,7 +174,7 @@ 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 } @@ -132,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; @@ -143,6 +212,30 @@ wxString wxMenuItemBase::GetLabelFromText(const wxString& text) return wxStripMenuCodes(text); } +// radio group stuff +// ----------------- + +void wxMenuItem::SetAsRadioGroupStart() +{ + m_isRadioGroupStart = TRUE; +} + +void wxMenuItem::SetRadioGroupStart(int start) +{ + wxASSERT_MSG( !m_isRadioGroupStart, + _T("should only be called for the next radio items") ); + + m_radioGroup.start = start; +} + +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 // ----------------- @@ -173,31 +266,55 @@ void wxMenuItem::Check(bool check) int flags = check ? MF_CHECKED : MF_UNCHECKED; HMENU hmenu = GetHMenuOf(m_parentMenu); - if ( GetKind() == wxItem_Radio ) + 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, - m_startRadioGroup, // first group item - m_endRadioGroup, // last one - pos, // the one to check - MF_BYPOSITION | flags) ) + 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::Node *node = items.Item(m_startRadioGroup); - for ( int n = m_startRadioGroup; n <= m_endRadioGroup && node; n++ ) + wxMenuItemList::compatibility_iterator node = items.Item(start); + for ( int n = start; n <= end && node; n++ ) { if ( n != pos ) { @@ -217,7 +334,7 @@ void wxMenuItem::Check(bool check) { if ( ::CheckMenuItem(hmenu, GetRealId(), - MF_BYCOMMAND | flags) == -1 ) + MF_BYCOMMAND | flags) == (DWORD)-1 ) { wxLogLastError(wxT("CheckMenuItem")); } @@ -234,6 +351,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") ); @@ -272,12 +393,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 } }