X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3aadbb82d9e8ea9b6495ea180112df6b9a94c4c7..2356708db31b737c6eae53c2316b642aa5a2e68d:/src/msw/menuitem.cpp?ds=inline diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp index 46625d1a08..bd46e7336a 100644 --- a/src/msw/menuitem.cpp +++ b/src/msw/menuitem.cpp @@ -2,32 +2,54 @@ // 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 +// --------------------------------------------------------------------------- +// convenience macro +// --------------------------------------------------------------------------- + +#define GetHMenuOf(menu) ((HMENU)menu->GetHMenu()) // ============================================================================ // implementation @@ -38,7 +60,7 @@ // ---------------------------------------------------------------------------- #if !defined(USE_SHARED_LIBRARY) || !USE_SHARED_LIBRARY -#if USE_OWNER_DRAWN +#if wxUSE_OWNER_DRAWN IMPLEMENT_DYNAMIC_CLASS2(wxMenuItem, wxObject, wxOwnerDrawn) #else //!USE_OWNER_DRAWN IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject) @@ -57,7 +79,7 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu, int id, const wxString& strName, const wxString& strHelp, bool bCheckable, wxMenu *pSubMenu) : -#if USE_OWNER_DRAWN +#if wxUSE_OWNER_DRAWN wxOwnerDrawn(strName, bCheckable), #else //no owner drawn support m_bCheckable(bCheckable), @@ -65,12 +87,12 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu, int id, #endif //owner drawn m_strHelp(strHelp) { - wxASSERT( pParentMenu != NULL ); + wxASSERT_MSG( pParentMenu != NULL, _T("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)); @@ -80,26 +102,32 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu, int id, #undef SYS_COLOR #endif - m_pParentMenu = pParentMenu; - m_pSubMenu = pSubMenu; - m_idItem = id; - m_bEnabled = TRUE; + m_pParentMenu = pParentMenu; + m_pSubMenu = pSubMenu; + m_bEnabled = TRUE; + m_bChecked = FALSE; + m_idItem = id; } -wxMenuItem::~wxMenuItem() +wxMenuItem::~wxMenuItem() { } // misc // ---- +// return the id for calling Win32 API functions +int wxMenuItem::GetRealId() const +{ + return m_pSubMenu ? (int)m_pSubMenu->GetHMenu() : GetId(); +} + // delete the sub menu +// ------------------- void wxMenuItem::DeleteSubMenu() { - wxASSERT( m_pSubMenu != NULL ); - - delete m_pSubMenu; - m_pSubMenu = NULL; + delete m_pSubMenu; + m_pSubMenu = NULL; } // change item state @@ -107,39 +135,83 @@ 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)); - } - else // submenu - { - 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)); - } + if ( m_bEnabled != bDoEnable ) { + long rc = EnableMenuItem(GetHMenuOf(m_pParentMenu), + GetRealId(), + MF_BYCOMMAND | + (bDoEnable ? MF_ENABLED : MF_GRAYED)); + + if ( rc == -1 ) { + wxLogLastError("EnableMenuItem"); + } - m_bEnabled = bDoEnable; - } + m_bEnabled = bDoEnable; + } } void wxMenuItem::Check(bool bDoCheck) { - wxCHECK_RET( IsCheckable(), "only checkable items may be checked" ); + wxCHECK_RET( IsCheckable(), _T("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 ( rc == -1 ) { + wxLogLastError("CheckMenuItem"); + } + + m_bChecked = bDoCheck; + } +} + +void wxMenuItem::SetName(const wxString& strName) +{ + // don't do anything if label didn't change + if ( m_strName == strName ) + return; - if ( m_bChecked != bDoCheck ) { - CheckMenuItem((HMENU)m_pParentMenu->GetHMenu(), m_idItem, - MF_BYCOMMAND | (bDoCheck ? MF_CHECKED : MF_UNCHECKED)); + m_strName = strName; + + HMENU hMenu = GetHMenuOf(m_pParentMenu); + + UINT id = GetRealId(); + UINT flagsOld = ::GetMenuState(hMenu, id, MF_BYCOMMAND); + if ( flagsOld == 0xFFFFFFFF ) + { + 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 = strName; + } + + if ( ::ModifyMenu(hMenu, id, + MF_BYCOMMAND | flagsOld, + id, data) == 0xFFFFFFFF ) + { + wxLogLastError(_T("ModifyMenu")); + } + } +} - m_bChecked = bDoCheck; - } -} \ No newline at end of file