X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a8cfd0cbf1899a3a41fe21a202d40f5448702b5a..8f25531f6f1ec5cc29f7ea8d09143133e1b8edbb:/src/msw/menuitem.cpp?ds=sidebyside diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp index 822bd0bfd6..2cabd2c1f2 100644 --- a/src/msw/menuitem.cpp +++ b/src/msw/menuitem.cpp @@ -28,6 +28,8 @@ #pragma hdrstop #endif +#if wxUSE_MENUS + #ifndef WX_PRECOMP #include "wx/font.h" #include "wx/bitmap.h" @@ -42,6 +44,10 @@ #include "wx/menuitem.h" #include "wx/log.h" +#if wxUSE_ACCEL + #include "wx/accel.h" +#endif // wxUSE_ACCEL + #include "wx/msw/private.h" // --------------------------------------------------------------------------- @@ -66,13 +72,7 @@ // dynamic classes implementation // ---------------------------------------------------------------------------- -#if !defined(USE_SHARED_LIBRARY) || !USE_SHARED_LIBRARY - #if wxUSE_OWNER_DRAWN - IMPLEMENT_DYNAMIC_CLASS2(wxMenuItem, wxMenuItemBase, wxOwnerDrawn) - #else //!USE_OWNER_DRAWN - IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxMenuItemBase) - #endif //USE_OWNER_DRAWN -#endif //USE_SHARED_LIBRARY +IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject) // ---------------------------------------------------------------------------- // wxMenuItem @@ -85,35 +85,33 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu, int id, const wxString& text, const wxString& strHelp, - bool bCheckable, - wxMenu *pSubMenu) : + wxItemKind kind, + wxMenu *pSubMenu) + : wxMenuItemBase(pParentMenu, id, text, strHelp, kind, pSubMenu) #if wxUSE_OWNER_DRAWN - wxOwnerDrawn(text, bCheckable) + , wxOwnerDrawn(GetLabelFromText(text), kind == wxItem_Check) #endif // owner drawn { wxASSERT_MSG( pParentMenu != NULL, wxT("a menu item should have a parent") ); + m_startRadioGroup = + m_endRadioGroup = -1; + #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)); + #undef SYS_COLOR + // we don't want normal items be owner-drawn ResetOwnerDrawn(); - #undef SYS_COLOR + // tell the owner drawing code to to show the accel string as well + SetAccelString(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() @@ -129,14 +127,6 @@ int wxMenuItem::GetRealId() const return m_subMenu ? (int)m_subMenu->GetHMenu() : GetId(); } -// delete the sub menu -// ------------------- -void wxMenuItem::DeleteSubMenu() -{ - delete m_subMenu; - m_subMenu = NULL; -} - // get item state // -------------- @@ -144,45 +134,96 @@ bool wxMenuItem::IsChecked() const { int flag = ::GetMenuState(GetHMenuOf(m_parentMenu), GetId(), MF_BYCOMMAND); - // don't "and" with MF_ENABLED because its value is 0 - return (flag & MF_DISABLED) == 0; + return (flag & MF_CHECKED) != 0; +} + +/* static */ +wxString wxMenuItemBase::GetLabelFromText(const wxString& text) +{ + return wxStripMenuCodes(text); } // change item state // ----------------- -void wxMenuItem::Enable(bool bDoEnable) +void wxMenuItem::Enable(bool enable) { - if ( m_isEnabled != bDoEnable ) { - long rc = EnableMenuItem(GetHMenuOf(m_parentMenu), - GetRealId(), - MF_BYCOMMAND | - (bDoEnable ? MF_ENABLED : MF_GRAYED)); - - if ( rc == -1 ) { - wxLogLastError("EnableMenuItem"); - } + if ( m_isEnabled == enable ) + return; - wxMenuItemBase::Enable(m_isEnabled); + long rc = EnableMenuItem(GetHMenuOf(m_parentMenu), + GetRealId(), + MF_BYCOMMAND | + (enable ? MF_ENABLED : MF_GRAYED)); + + if ( rc == -1 ) { + wxLogLastError(wxT("EnableMenuItem")); } + + wxMenuItemBase::Enable(enable); } -void wxMenuItem::Check(bool bDoCheck) +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; - if ( m_isChecked != bDoCheck ) { - long rc = CheckMenuItem(GetHMenuOf(m_parentMenu), - GetId(), - MF_BYCOMMAND | - (bDoCheck ? MF_CHECKED : MF_UNCHECKED)); + int flags = check ? MF_CHECKED : MF_UNCHECKED; + HMENU hmenu = GetHMenuOf(m_parentMenu); - if ( rc == -1 ) { - wxLogLastError("CheckMenuItem"); + if ( GetKind() == wxItem_Radio ) + { + // it doesn't make sense to uncheck a radio item - what would this do? + if ( !check ) + return; + + 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?") ); + +#ifdef __WIN32__ + if ( !::CheckMenuRadioItem(hmenu, + m_startRadioGroup, // first group item + m_endRadioGroup, // last one + pos, // the one to check + MF_BYPOSITION | flags) ) + { + wxLogLastError(_T("CheckMenuRadioItem")); } +#endif // __WIN32__ - wxMenuItemBase::Check(m_isChecked); + // 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++ ) + { + if ( n != pos ) + { + node->GetData()->m_isChecked = FALSE; + } + + // we also have to do it in the menu for Win16 (under Win32 + // CheckMenuRadioItem() does it for us) +#ifndef __WIN32__ + ::CheckMenuItem(hmenu, n, n == pos ? MF_CHECKED : MF_UNCHECKED); +#endif // Win16 + + node = node->GetNext(); + } } + else // check item + { + if ( ::CheckMenuItem(hmenu, + GetRealId(), + MF_BYCOMMAND | flags) == -1 ) + { + wxLogLastError(wxT("CheckMenuItem")); + } + } + + wxMenuItemBase::Check(check); } void wxMenuItem::SetText(const wxString& text) @@ -195,12 +236,17 @@ void wxMenuItem::SetText(const wxString& text) OWNER_DRAWN_ONLY( wxOwnerDrawn::SetName(text) ); HMENU hMenu = GetHMenuOf(m_parentMenu); + wxCHECK_RET( hMenu, wxT("menuitem without menu") ); + +#if wxUSE_ACCEL + m_parentMenu->UpdateAccel(this); +#endif // wxUSE_ACCEL UINT id = GetRealId(); UINT flagsOld = ::GetMenuState(hMenu, id, MF_BYCOMMAND); if ( flagsOld == 0xFFFFFFFF ) { - wxLogLastError("GetMenuState"); + wxLogLastError(wxT("GetMenuState")); } else { @@ -223,7 +269,7 @@ void wxMenuItem::SetText(const wxString& text) #endif //owner drawn { flagsOld |= MF_STRING; - data = (char*) text.c_str(); + data = (wxChar*) text.c_str(); } if ( ::ModifyMenu(hMenu, id, @@ -249,8 +295,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