X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a17e237f4ada1196d7c0f0c23d4dface749c587a..a582395301f296706dc9e59d0346cddd165eacd8:/src/msw/menuitem.cpp diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp index f40498487b..6e450bc973 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" @@ -39,18 +41,29 @@ #include "wx/string.h" #endif -#include "wx/ownerdrw.h" #include "wx/menuitem.h" #include "wx/log.h" +#if wxUSE_ACCEL + #include "wx/accel.h" +#endif // wxUSE_ACCEL + #include "wx/msw/private.h" // --------------------------------------------------------------------------- -// convenience macro +// macro // --------------------------------------------------------------------------- +// hide the ugly cast #define GetHMenuOf(menu) ((HMENU)menu->GetHMenu()) +// conditional compilation +#if wxUSE_OWNER_DRAWN + #define OWNER_DRAWN_ONLY( code ) if ( IsOwnerDrawn() ) code +#else // !wxUSE_OWNER_DRAWN + #define OWNER_DRAWN_ONLY( code ) +#endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN + // ============================================================================ // implementation // ============================================================================ @@ -59,14 +72,7 @@ // dynamic classes implementation // ---------------------------------------------------------------------------- -#if !defined(USE_SHARED_LIBRARY) || !USE_SHARED_LIBRARY -#if wxUSE_OWNER_DRAWN - IMPLEMENT_DYNAMIC_CLASS2(wxMenuItem, wxObject, wxOwnerDrawn) -#else //!USE_OWNER_DRAWN - IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject) -#endif //USE_OWNER_DRAWN - -#endif //USE_SHARED_LIBRARY +IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject) // ---------------------------------------------------------------------------- // wxMenuItem @@ -75,38 +81,55 @@ // ctor & dtor // ----------- -wxMenuItem::wxMenuItem(wxMenu *pParentMenu, int id, - const wxString& strName, const wxString& strHelp, - bool bCheckable, - wxMenu *pSubMenu) : +wxMenuItem::wxMenuItem(wxMenu *pParentMenu, + int id, + const wxString& text, + const wxString& strHelp, + wxItemKind kind, + wxMenu *pSubMenu) + : wxMenuItemBase(pParentMenu, id, text, strHelp, kind, pSubMenu) #if wxUSE_OWNER_DRAWN - wxOwnerDrawn(strName, bCheckable), -#else //no owner drawn support - m_bCheckable(bCheckable), - m_strName(strName), -#endif //owner drawn - m_strHelp(strHelp) + , wxOwnerDrawn(GetLabelFromText(text), kind == wxITEM_CHECK) +#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(GetLabelFromText(text), isCheckable) +#endif // owner drawn { - wxASSERT_MSG( pParentMenu != NULL, wxT("a menu item should have a parent") ); + 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)); + #undef SYS_COLOR + // we don't want normal items be owner-drawn ResetOwnerDrawn(); - #undef SYS_COLOR -#endif - - m_pParentMenu = pParentMenu; - m_pSubMenu = pSubMenu; - m_bEnabled = TRUE; - m_bChecked = FALSE; - m_idItem = id; + // tell the owner drawing code to to show the accel string as well + SetAccelString(m_text.AfterFirst(_T('\t'))); +#endif // wxUSE_OWNER_DRAWN } wxMenuItem::~wxMenuItem() @@ -119,69 +142,177 @@ wxMenuItem::~wxMenuItem() // return the id for calling Win32 API functions int wxMenuItem::GetRealId() const { - return m_pSubMenu ? (int)m_pSubMenu->GetHMenu() : GetId(); + return m_subMenu ? (int)m_subMenu->GetHMenu() : GetId(); +} + +// get item state +// -------------- + +bool wxMenuItem::IsChecked() const +{ + int flag = ::GetMenuState(GetHMenuOf(m_parentMenu), GetId(), MF_BYCOMMAND); + + return (flag & MF_CHECKED) != 0; +} + +/* static */ +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; } -// delete the sub menu -// ------------------- -void wxMenuItem::DeleteSubMenu() +void wxMenuItem::SetRadioGroupEnd(int end) { - delete m_pSubMenu; - m_pSubMenu = NULL; + wxASSERT_MSG( m_isRadioGroupStart, + _T("should only be called for the first radio item") ); + + m_radioGroup.end = end; } // change item state // ----------------- -void wxMenuItem::Enable(bool bDoEnable) +void wxMenuItem::Enable(bool enable) { - if ( m_bEnabled != bDoEnable ) { - long rc = EnableMenuItem(GetHMenuOf(m_pParentMenu), - GetRealId(), - MF_BYCOMMAND | - (bDoEnable ? MF_ENABLED : MF_GRAYED)); - - if ( rc == -1 ) { - wxLogLastError("EnableMenuItem"); - } + if ( m_isEnabled == enable ) + return; + + long rc = EnableMenuItem(GetHMenuOf(m_parentMenu), + GetRealId(), + MF_BYCOMMAND | + (enable ? MF_ENABLED : MF_GRAYED)); - m_bEnabled = bDoEnable; + if ( rc == -1 ) { + wxLogLastError(wxT("EnableMenuItem")); } + + wxMenuItemBase::Enable(enable); } -void wxMenuItem::Check(bool bDoCheck) +void wxMenuItem::Check(bool check) { wxCHECK_RET( IsCheckable(), wxT("only checkable items may be checked") ); - if ( m_bChecked != bDoCheck ) { - long rc = CheckMenuItem(GetHMenuOf(m_pParentMenu), - GetId(), - MF_BYCOMMAND | - (bDoCheck ? MF_CHECKED : MF_UNCHECKED)); + if ( m_isChecked == check ) + return; + + int flags = check ? MF_CHECKED : MF_UNCHECKED; + HMENU hmenu = GetHMenuOf(m_parentMenu); + + 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 ( rc == -1 ) { - wxLogLastError("CheckMenuItem"); + 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__ - m_bChecked = bDoCheck; + // also uncheck all the other items in this radio group + wxMenuItemList::Node *node = items.Item(start); + for ( int n = start; n <= end && 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) == (DWORD)-1 ) + { + wxLogLastError(wxT("CheckMenuItem")); + } + } + + wxMenuItemBase::Check(check); } -void wxMenuItem::SetName(const wxString& strName) +void wxMenuItem::SetText(const wxString& text) { // don't do anything if label didn't change - if ( m_strName == strName ) + if ( m_text == text ) return; - m_strName = strName; + wxMenuItemBase::SetText(text); + OWNER_DRAWN_ONLY( wxOwnerDrawn::SetName(text) ); - HMENU hMenu = GetHMenuOf(m_pParentMenu); + 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 { @@ -193,6 +324,7 @@ void wxMenuItem::SetName(const wxString& strName) } LPCTSTR data; + #if wxUSE_OWNER_DRAWN if ( IsOwnerDrawn() ) { @@ -203,7 +335,7 @@ void wxMenuItem::SetName(const wxString& strName) #endif //owner drawn { flagsOld |= MF_STRING; - data = strName; + data = (wxChar*) text.c_str(); } if ( ::ModifyMenu(hMenu, id, @@ -215,3 +347,24 @@ void wxMenuItem::SetName(const wxString& strName) } } +void wxMenuItem::SetCheckable(bool checkable) +{ + wxMenuItemBase::SetCheckable(checkable); + OWNER_DRAWN_ONLY( wxOwnerDrawn::SetCheckable(checkable) ); +} + +// ---------------------------------------------------------------------------- +// wxMenuItemBase +// ---------------------------------------------------------------------------- + +wxMenuItem *wxMenuItemBase::New(wxMenu *parentMenu, + int id, + const wxString& name, + const wxString& help, + wxItemKind kind, + wxMenu *subMenu) +{ + return new wxMenuItem(parentMenu, id, name, help, kind, subMenu); +} + +#endif // wxUSE_MENUS