X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3aadbb82d9e8ea9b6495ea180112df6b9a94c4c7..9874b4ee8308b8989c5df7db4f3559625299d0a4:/src/msw/menuitem.cpp diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp index 46625d1a08..822bd0bfd6 100644 --- a/src/msw/menuitem.cpp +++ b/src/msw/menuitem.cpp @@ -2,32 +2,61 @@ // Name: menuitem.cpp // Purpose: wxMenuItem implementation // Author: Vadim Zeitlin -// Modified by: +// Modified by: // Created: 11.11.97 // RCS-ID: $Id$ // Copyright: (c) 1998 Vadim Zeitlin // Licence: wxWindows license /////////////////////////////////////////////////////////////////////////////// -// ============================================================================ -// headers & declarations -// ============================================================================ +// =========================================================================== +// declarations +// =========================================================================== + +// --------------------------------------------------------------------------- +// headers +// --------------------------------------------------------------------------- + +#ifdef __GNUG__ + #pragma implementation "menuitem.h" +#endif // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #ifndef WX_PRECOMP -#include "wx/menu.h" + #include "wx/font.h" + #include "wx/bitmap.h" + #include "wx/settings.h" + #include "wx/font.h" + #include "wx/window.h" + #include "wx/accel.h" + #include "wx/menu.h" + #include "wx/string.h" #endif -#include "wx/ownerdrw.h" #include "wx/menuitem.h" +#include "wx/log.h" + +#include "wx/msw/private.h" -#include +// --------------------------------------------------------------------------- +// 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 @@ -38,12 +67,11 @@ // ---------------------------------------------------------------------------- #if !defined(USE_SHARED_LIBRARY) || !USE_SHARED_LIBRARY -#if USE_OWNER_DRAWN - IMPLEMENT_DYNAMIC_CLASS2(wxMenuItem, wxObject, wxOwnerDrawn) -#else //!USE_OWNER_DRAWN - IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject) -#endif //USE_OWNER_DRAWN - + #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 // ---------------------------------------------------------------------------- @@ -53,24 +81,22 @@ // ctor & dtor // ----------- -wxMenuItem::wxMenuItem(wxMenu *pParentMenu, int id, - const wxString& strName, const wxString& strHelp, +wxMenuItem::wxMenuItem(wxMenu *pParentMenu, + int id, + const wxString& text, + const wxString& strHelp, bool bCheckable, wxMenu *pSubMenu) : -#if USE_OWNER_DRAWN - wxOwnerDrawn(strName, bCheckable), -#else //no owner drawn support - m_bCheckable(bCheckable), - m_strName(strName), -#endif //owner drawn - m_strHelp(strHelp) +#if wxUSE_OWNER_DRAWN + wxOwnerDrawn(text, bCheckable) +#endif // owner drawn { - wxASSERT( pParentMenu != NULL ); + wxASSERT_MSG( pParentMenu != NULL, wxT("a menu item should have a parent") ); -#if USE_OWNER_DRAWN +#if wxUSE_OWNER_DRAWN // set default menu colors #define SYS_COLOR(c) (wxSystemSettings::GetSystemColour(wxSYS_COLOUR_##c)) - + SetTextColour(SYS_COLOR(MENUTEXT)); SetBackgroundColour(SYS_COLOR(MENU)); @@ -78,28 +104,48 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu, int id, ResetOwnerDrawn(); #undef SYS_COLOR -#endif +#endif // wxUSE_OWNER_DRAWN - m_pParentMenu = pParentMenu; - m_pSubMenu = pSubMenu; - m_idItem = id; - m_bEnabled = TRUE; + 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() +wxMenuItem::~wxMenuItem() { } // misc // ---- +// return the id for calling Win32 API functions +int wxMenuItem::GetRealId() const +{ + return m_subMenu ? (int)m_subMenu->GetHMenu() : GetId(); +} + // delete the sub menu +// ------------------- void wxMenuItem::DeleteSubMenu() { - wxASSERT( m_pSubMenu != NULL ); + delete m_subMenu; + m_subMenu = NULL; +} + +// get item state +// -------------- - delete m_pSubMenu; - m_pSubMenu = NULL; +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; } // change item state @@ -107,39 +153,104 @@ void wxMenuItem::DeleteSubMenu() void wxMenuItem::Enable(bool bDoEnable) { - if ( m_bEnabled != bDoEnable ) { - if ( m_pSubMenu == NULL ) { // normal menu item - EnableMenuItem((HMENU)m_pParentMenu->GetHMenu(), m_idItem, - MF_BYCOMMAND | (bDoEnable ? MF_ENABLED: MF_GRAYED)); + if ( m_isEnabled != bDoEnable ) { + long rc = EnableMenuItem(GetHMenuOf(m_parentMenu), + GetRealId(), + MF_BYCOMMAND | + (bDoEnable ? MF_ENABLED : MF_GRAYED)); + + if ( rc == -1 ) { + wxLogLastError("EnableMenuItem"); + } + + wxMenuItemBase::Enable(m_isEnabled); + } +} + +void wxMenuItem::Check(bool bDoCheck) +{ + wxCHECK_RET( m_isCheckable, wxT("only checkable items may be checked") ); + + if ( m_isChecked != bDoCheck ) { + long rc = CheckMenuItem(GetHMenuOf(m_parentMenu), + GetId(), + MF_BYCOMMAND | + (bDoCheck ? MF_CHECKED : MF_UNCHECKED)); + + if ( rc == -1 ) { + wxLogLastError("CheckMenuItem"); + } + + wxMenuItemBase::Check(m_isChecked); } - else // submenu +} + +void wxMenuItem::SetText(const wxString& text) +{ + // don't do anything if label didn't change + if ( m_text == text ) + return; + + wxMenuItemBase::SetText(text); + OWNER_DRAWN_ONLY( wxOwnerDrawn::SetName(text) ); + + HMENU hMenu = GetHMenuOf(m_parentMenu); + + UINT id = GetRealId(); + UINT flagsOld = ::GetMenuState(hMenu, id, MF_BYCOMMAND); + if ( flagsOld == 0xFFFFFFFF ) { - wxMenu *father = m_pSubMenu->m_topLevelMenu ; - wxNode *node = father->m_menuItems.First() ; - int i = 0 ; - while (node) { - wxMenuItem *matched = (wxMenuItem*)node->Data(); - if ( matched == this) - break; - i++; - node = node->Next(); - } - EnableMenuItem((HMENU)father->m_savehMenu, i, - MF_BYPOSITION | (bDoEnable ? MF_ENABLED: MF_GRAYED)); + wxLogLastError("GetMenuState"); } + else + { + if ( IsSubMenu() ) + { + // high byte contains the number of items in a submenu for submenus + flagsOld &= 0xFF; + flagsOld |= MF_POPUP; + } + + LPCTSTR data; + +#if wxUSE_OWNER_DRAWN + if ( IsOwnerDrawn() ) + { + flagsOld |= MF_OWNERDRAW; + data = (LPCTSTR)this; + } + else +#endif //owner drawn + { + flagsOld |= MF_STRING; + data = (char*) text.c_str(); + } - m_bEnabled = bDoEnable; - } + if ( ::ModifyMenu(hMenu, id, + MF_BYCOMMAND | flagsOld, + id, data) == (int)0xFFFFFFFF ) + { + wxLogLastError(wxT("ModifyMenu")); + } + } } -void wxMenuItem::Check(bool bDoCheck) +void wxMenuItem::SetCheckable(bool checkable) { - wxCHECK_RET( IsCheckable(), "only checkable items may be checked" ); + wxMenuItemBase::SetCheckable(checkable); + OWNER_DRAWN_ONLY( wxOwnerDrawn::SetCheckable(checkable) ); +} - if ( m_bChecked != bDoCheck ) { - CheckMenuItem((HMENU)m_pParentMenu->GetHMenu(), m_idItem, - MF_BYCOMMAND | (bDoCheck ? MF_CHECKED : MF_UNCHECKED)); +// ---------------------------------------------------------------------------- +// wxMenuItemBase +// ---------------------------------------------------------------------------- - m_bChecked = bDoCheck; - } -} \ No newline at end of file +wxMenuItem *wxMenuItemBase::New(wxMenu *parentMenu, + int id, + const wxString& name, + const wxString& help, + bool isCheckable, + wxMenu *subMenu) +{ + return new wxMenuItem(parentMenu, id, name, help, isCheckable, subMenu); +}