X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/223d09f6b523aac674ef9b72a883dfa8d37c5d4e..c6e62f74fcac5b62889b59e7ce7a41d0ce884d7b:/src/os2/menuitem.cpp diff --git a/src/os2/menuitem.cpp b/src/os2/menuitem.cpp index 38d31737e7..a5a809c051 100644 --- a/src/os2/menuitem.cpp +++ b/src/os2/menuitem.cpp @@ -1,11 +1,11 @@ /////////////////////////////////////////////////////////////////////////////// // Name: menuitem.cpp // Purpose: wxMenuItem implementation -// Author: AUTHOR -// Modified by: -// Created: ??/??/98 +// Author: David Webster +// Modified by: +// Created: 10/10/98 // RCS-ID: $Id$ -// Copyright: (c) AUTHOR +// Copyright: (c) David Webster // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -13,8 +13,42 @@ // headers & declarations // ============================================================================ -#include "wx/menu.h" +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#ifndef WX_PRECOMP + #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/menuitem.h" +#include "wx/log.h" + +#if wxUSE_ACCEL + #include "wx/accel.h" +#endif // wxUSE_ACCEL + +#include "wx/os2/private.h" + +// --------------------------------------------------------------------------- +// 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 @@ -24,9 +58,11 @@ // dynamic classes implementation // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY - IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject) -#endif //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 // ---------------------------------------------------------------------------- // wxMenuItem @@ -35,61 +71,196 @@ // 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) : - m_bCheckable(bCheckable), - m_strName(strName), - 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 wxUSE_OWNER_DRAWN + // set default menu colors + #define SYS_COLOR(c) (wxSystemSettings::GetSystemColour(wxSYS_COLOUR_##c)) + + SetTextColour(SYS_COLOR(MENUTEXT)); + SetBackgroundColour(SYS_COLOR(MENU)); - m_pParentMenu = pParentMenu; - m_pSubMenu = pSubMenu; - m_idItem = id; - m_bEnabled = TRUE; + // we don't want normal items be owner-drawn + ResetOwnerDrawn(); + + #undef SYS_COLOR +#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() +wxMenuItem::~wxMenuItem() { } // misc // ---- -// delete the sub menu -void wxMenuItem::DeleteSubMenu() +// return the id for calling Win32 API functions +int wxMenuItem::GetRealId() const +{ + return m_subMenu ? (int)m_subMenu->GetHMenu() : GetId(); +} + +// get item state +// -------------- + +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 FALSE; +} + +wxString wxMenuItem::GetLabel() const { - wxASSERT( m_pSubMenu != NULL ); + return wxStripMenuCodes(m_text); +} + +// accelerators +// ------------ - delete m_pSubMenu; - m_pSubMenu = NULL; +#if wxUSE_ACCEL + +wxAcceleratorEntry *wxMenuItem::GetAccel() const +{ + return wxGetAccelFromString(GetText()); } +#endif // wxUSE_ACCEL + // change item state // ----------------- -void wxMenuItem::Enable(bool bDoEnable) +void wxMenuItem::Enable(bool enable) { - if ( m_bEnabled != bDoEnable ) { - if ( m_pSubMenu == NULL ) { // normal menu item - // TODO + if ( m_isEnabled == enable ) + return; +/* + long rc = EnableMenuItem(GetHMenuOf(m_parentMenu), + GetRealId(), + MF_BYCOMMAND | + (enable ? MF_ENABLED : MF_GRAYED)); + + if ( rc == -1 ) { + wxLogLastError("EnableMenuItem"); + } +*/ + wxMenuItemBase::Enable(enable); +} + +void wxMenuItem::Check(bool check) +{ + wxCHECK_RET( m_isCheckable, wxT("only checkable items may be checked") ); + + if ( m_isChecked == check ) + return; +/* + long rc = CheckMenuItem(GetHMenuOf(m_parentMenu), + GetRealId(), + MF_BYCOMMAND | + (check ? MF_CHECKED : MF_UNCHECKED)); + + if ( rc == -1 ) { + wxLogLastError("CheckMenuItem"); } - else // submenu +*/ + wxMenuItemBase::Check(check); +} + +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); + 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 ) { - // TODO + wxLogLastError("GetMenuState"); } + else + { + if ( IsSubMenu() ) + { + // high byte contains the number of items in a submenu for submenus + flagsOld &= 0xFF; + flagsOld |= MF_POPUP; + } + + LPCTSTR data; - m_bEnabled = bDoEnable; - } +#if wxUSE_OWNER_DRAWN + if ( IsOwnerDrawn() ) + { + flagsOld |= MF_OWNERDRAW; + data = (LPCTSTR)this; + } + else +#endif //owner drawn + { + flagsOld |= MF_STRING; + data = (char*) text.c_str(); + } + + 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 ) { - // TODO - m_bChecked = bDoCheck; - } +// ---------------------------------------------------------------------------- +// wxMenuItemBase +// ---------------------------------------------------------------------------- + +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); +}