X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/223d09f6b523aac674ef9b72a883dfa8d37c5d4e..a842a96e24cff3d4448fbdb6c2e94dd9f4ad54da:/src/os2/menuitem.cpp diff --git a/src/os2/menuitem.cpp b/src/os2/menuitem.cpp index 38d31737e7..1d960c605b 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,84 @@ // headers & declarations // ============================================================================ -#include "wx/menu.h" +#ifdef __GNUG__ + #pragma implementation "menuitem.h" +#endif + +// 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 + +// ---------------------------------------------------------------------------- +// static function for translating menu labels +// ---------------------------------------------------------------------------- + +static wxString TextToLabel(const wxString& rTitle) +{ + wxString Title; + const wxChar *pc; + for (pc = rTitle; *pc != wxT('\0'); pc++ ) + { + if (*pc == wxT('&') ) + { + if (*(pc+1) == wxT('&')) + { + pc++; + Title << wxT('&'); + } + else + Title << wxT('~'); + } +// else if (*pc == wxT('/')) +// { +// Title << wxT('\\'); +// } + else + { + if ( *pc == wxT('~') ) + { + // tildes must be doubled to prevent them from being + // interpreted as accelerator character prefix by PM ??? + Title << *pc; + } + Title << *pc; + } + } + return Title; +} // ============================================================================ // implementation @@ -24,9 +100,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 +113,282 @@ // ctor & dtor // ----------- -wxMenuItem::wxMenuItem(wxMenu *pParentMenu, int id, - const wxString& strName, const wxString& strHelp, - bool bCheckable, - wxMenu *pSubMenu) : - m_bCheckable(bCheckable), - m_strName(strName), - m_strHelp(strHelp) +wxMenuItem::wxMenuItem( + wxMenu* pParentMenu +, int nId +, const wxString& rText +, const wxString& rStrHelp +, bool bCheckable +, wxMenu* pSubMenu +) +#if wxUSE_OWNER_DRAWN +: wxOwnerDrawn( TextToLabel(rText) + ,bCheckable + ) +#endif // owner drawn { - wxASSERT( pParentMenu != NULL ); + wxASSERT_MSG(pParentMenu != NULL, wxT("a menu item should have a parent")); - m_pParentMenu = pParentMenu; - m_pSubMenu = pSubMenu; - m_idItem = id; - m_bEnabled = TRUE; -} +#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)); + + // + // We don't want normal items be owner-drawn + // + ResetOwnerDrawn(); -wxMenuItem::~wxMenuItem() + #undef SYS_COLOR +#endif // wxUSE_OWNER_DRAWN + + m_parentMenu = pParentMenu; + m_subMenu = pSubMenu; + m_isEnabled = TRUE; + m_isChecked = FALSE; + m_id = nId; + m_text = TextToLabel(rText); + m_isCheckable = bCheckable; + m_help = rStrHelp; + memset(&m_vMenuData, '\0', sizeof(m_vMenuData)); + m_vMenuData.id= nId; +} // end of wxMenuItem::wxMenuItem + +wxMenuItem::~wxMenuItem() { -} +} // end of wxMenuItem::~wxMenuItem -// misc +// +// 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(); +} // end of wxMenuItem::GetRealId + +// +// Get item state +// -------------- +bool wxMenuItem::IsChecked() const +{ + USHORT uFlag = SHORT1FROMMR(::WinSendMsg( GetHMenuOf(m_parentMenu) + ,MM_QUERYITEMATTR + ,MPFROM2SHORT(GetId(), TRUE) + ,MPFROMSHORT(MIA_CHECKED) + )); + + return (uFlag & MIA_CHECKED); +} // end of wxMenuItem::IsChecked + +wxString wxMenuItemBase::GetLabelFromText( + const wxString& rText +) { - wxASSERT( m_pSubMenu != NULL ); + wxString label; + for ( const wxChar *pc = rText.c_str(); *pc; pc++ ) + { + if ( *pc == wxT('~') || *pc == wxT('&') ) + { + // '~' is the escape character for GTK+ and '&' is the one for + // wxWindows - skip both of them + continue; + } - delete m_pSubMenu; - m_pSubMenu = NULL; + label += *pc; + } + return label; } +// accelerators +// ------------ + +#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 bEnable +) { - if ( m_bEnabled != bDoEnable ) { - if ( m_pSubMenu == NULL ) { // normal menu item - // TODO + bool bOk; + + if (m_isEnabled == bEnable) + return; + if (bEnable) + bOk = (bool)::WinSendMsg( GetHMenuOf(m_parentMenu) + ,MM_SETITEMATTR + ,MPFROM2SHORT(GetRealId(), TRUE) + ,MPFROM2SHORT(MIA_DISABLED, FALSE) + ); + else + bOk = (bool)::WinSendMsg( GetHMenuOf(m_parentMenu) + ,MM_SETITEMATTR + ,MPFROM2SHORT(GetRealId(), TRUE) + ,MPFROM2SHORT(MIA_DISABLED, MIA_DISABLED) + ); + if (!bOk) + { + wxLogLastError("EnableMenuItem"); } - else // submenu + wxMenuItemBase::Enable(bEnable); +} // end of wxMenuItem::Enable + +void wxMenuItem::Check( + bool bCheck +) +{ + bool bOk; + + wxCHECK_RET( m_isCheckable, wxT("only checkable items may be checked") ); + if (m_isChecked == bCheck) + return; + if (bCheck) + bOk = (bool)::WinSendMsg( GetHMenuOf(m_parentMenu) + ,MM_SETITEMATTR + ,MPFROM2SHORT(GetRealId(), TRUE) + ,MPFROM2SHORT(MIA_CHECKED, MIA_CHECKED) + ); + else + bOk = (bool)::WinSendMsg( GetHMenuOf(m_parentMenu) + ,MM_SETITEMATTR + ,MPFROM2SHORT(GetRealId(), TRUE) + ,MPFROM2SHORT(MIA_CHECKED, FALSE) + ); + if (!bOk) { - // TODO + wxLogLastError("CheckMenuItem"); } + wxMenuItemBase::Check(bCheck); +} // end of wxMenuItem::Check - m_bEnabled = bDoEnable; - } -} +void wxMenuItem::SetText( + const wxString& rText +) +{ + // + // Don't do anything if label didn't change + // + + wxString Text = TextToLabel(rText); + if (m_text == Text) + return; + + wxMenuItemBase::SetText(Text); + OWNER_DRAWN_ONLY(wxOwnerDrawn::SetName(Text)); + + HWND hMenu = GetHMenuOf(m_parentMenu); + + wxCHECK_RET(hMenu, wxT("menuitem without menu")); + +#if wxUSE_ACCEL + m_parentMenu->UpdateAccel(this); +#endif // wxUSE_ACCEL + + USHORT uId = GetRealId(); + MENUITEM vItem; + USHORT uFlagsOld; + + if (!::WinSendMsg( hMenu + ,MM_QUERYITEM + ,MPFROM2SHORT(uId, TRUE) + ,(MPARAM)&vItem + )) + { + wxLogLastError("GetMenuState"); + } + else + { + uFlagsOld = vItem.afStyle; + if (IsSubMenu()) + { + uFlagsOld |= MIS_SUBMENU; + } + + BYTE* pData; + +#if wxUSE_OWNER_DRAWN + if (IsOwnerDrawn()) + { + uFlagsOld |= MIS_OWNERDRAW; + pData = (BYTE*)this; + } + else +#endif //owner drawn + { + uFlagsOld |= MIS_TEXT; + pData = (BYTE*)Text.c_str(); + } + + // + // Set the style + // + if (!::WinSendMsg( hMenu + ,MM_SETITEM + ,MPFROM2SHORT(uId, TRUE) + ,(MPARAM)&vItem + )) + { + wxLogLastError(wxT("ModifyMenu")); + } + + // + // Set the text + // + if (::WinSendMsg( hMenu + ,MM_SETITEMTEXT + ,MPFROMSHORT(uId) + ,(MPARAM)pData + )) + { + wxLogLastError(wxT("ModifyMenu")); + } + } +} // end of wxMenuItem::SetText + +void wxMenuItem::SetCheckable( + bool bCheckable +) +{ + wxMenuItemBase::SetCheckable(bCheckable); + OWNER_DRAWN_ONLY(wxOwnerDrawn::SetCheckable(bCheckable)); +} // end of wxMenuItem::SetCheckable + +// ---------------------------------------------------------------------------- +// wxMenuItemBase +// ---------------------------------------------------------------------------- -void wxMenuItem::Check(bool bDoCheck) +wxMenuItem* wxMenuItemBase::New( + wxMenu* pParentMenu +, int nId +, const wxString& rName +, const wxString& rHelp +, bool bIsCheckable +, wxMenu* pSubMenu +) { - wxCHECK_RET( IsCheckable(), "only checkable items may be checked" ); + return new wxMenuItem( pParentMenu + ,nId + ,rName + ,rHelp + ,bIsCheckable + ,pSubMenu + ); +} // end of wxMenuItemBase::New - if ( m_bChecked != bDoCheck ) { - // TODO - m_bChecked = bDoCheck; - }