X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/75f11ad7ca4201f7e2626a2bf5ad84a01296eb4a..594f0f5bf1355fb8d58f403d3ebacc1c1767c429:/src/os2/menuitem.cpp diff --git a/src/os2/menuitem.cpp b/src/os2/menuitem.cpp index 1c1353c558..16ea72e6a0 100644 --- a/src/os2/menuitem.cpp +++ b/src/os2/menuitem.cpp @@ -13,6 +13,10 @@ // headers & declarations // ============================================================================ +#ifdef __GNUG__ + #pragma implementation "menuitem.h" +#endif + // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -27,18 +31,67 @@ #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/os2/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 + +// ---------------------------------------------------------------------------- +// 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 // ============================================================================ @@ -47,14 +100,11 @@ // 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 + #if wxUSE_OWNER_DRAWN + IMPLEMENT_DYNAMIC_CLASS2(wxMenuItem, wxMenuItemBase, wxOwnerDrawn) + #else //!USE_OWNER_DRAWN + IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxMenuItemBase) + #endif //USE_OWNER_DRAWN // ---------------------------------------------------------------------------- // wxMenuItem @@ -63,153 +113,270 @@ // ctor & dtor // ----------- -wxMenuItem::wxMenuItem(wxMenu *pParentMenu, int id, - const wxString& strName, const wxString& strHelp, - bool bCheckable, - wxMenu *pSubMenu) : +wxMenuItem::wxMenuItem( + wxMenu* pParentMenu +, int nId +, const wxString& rText +, const wxString& rStrHelp +, bool bCheckable +, wxMenu* 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( TextToLabel(rText) + ,bCheckable + ) +#endif // owner drawn { - wxASSERT_MSG( pParentMenu != NULL, wxT("a menu item should have a parent") ); + wxASSERT_MSG(pParentMenu != NULL, wxT("a menu item should have a parent")); #if wxUSE_OWNER_DRAWN - // set default menu colors + + // + // 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 + // + // 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; -} +#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 // ---- -// return the id for calling Win32 API functions +// +// 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(); +} // end of wxMenuItem::GetRealId -// delete the sub menu -// ------------------- -void wxMenuItem::DeleteSubMenu() +// +// 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 +) { - delete m_pSubMenu; - 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; + } + + label += *pc; + } + return label; } // change item state // ----------------- -void wxMenuItem::Enable(bool bDoEnable) +void wxMenuItem::Enable( + bool bEnable +) { - // TODO: -/* - if ( m_bEnabled != bDoEnable ) { - long rc = EnableMenuItem(GetHMenuOf(m_pParentMenu), - GetRealId(), - MF_BYCOMMAND | - (bDoEnable ? MF_ENABLED : MF_GRAYED)); - - if ( rc == -1 ) { - wxLogLastError("EnableMenuItem"); - } + bool bOk; - m_bEnabled = bDoEnable; + 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"); } -*/ -} + wxMenuItemBase::Enable(bEnable); +} // end of wxMenuItem::Enable -void wxMenuItem::Check(bool bDoCheck) +void wxMenuItem::Check( + bool bCheck +) { - wxCHECK_RET( IsCheckable(), wxT("only checkable items may be checked") ); - - // TODO: -/* - if ( m_bChecked != bDoCheck ) { - long rc = CheckMenuItem(GetHMenuOf(m_pParentMenu), - GetId(), - MF_BYCOMMAND | - (bDoCheck ? MF_CHECKED : MF_UNCHECKED)); - - if ( rc == -1 ) { - wxLogLastError("CheckMenuItem"); - } + bool bOk; - m_bChecked = bDoCheck; + 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) + { + wxLogLastError("CheckMenuItem"); } -*/ -} + wxMenuItemBase::Check(bCheck); +} // end of wxMenuItem::Check -void wxMenuItem::SetName(const wxString& strName) +void wxMenuItem::SetText( + const wxString& rText +) { - // don't do anything if label didn't change - if ( m_strName == strName ) + // + // Don't do anything if label didn't change + // + + wxString Text = TextToLabel(rText); + if (m_text == Text) return; - m_strName = strName; + wxMenuItemBase::SetText(Text); + OWNER_DRAWN_ONLY(wxOwnerDrawn::SetName(Text)); - HMENU hMenu = GetHMenuOf(m_pParentMenu); + HWND hMenu = GetHMenuOf(m_parentMenu); - UINT id = GetRealId(); + wxCHECK_RET(hMenu, wxT("menuitem without menu")); - // TODO: -/* - UINT flagsOld = ::GetMenuState(hMenu, id, MF_BYCOMMAND); - if ( flagsOld == 0xFFFFFFFF ) +#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 { - if ( IsSubMenu() ) + uFlagsOld = vItem.afStyle; + if (IsSubMenu()) { - // high byte contains the number of items in a submenu for submenus - flagsOld &= 0xFF; - flagsOld |= MF_POPUP; + uFlagsOld |= MIS_SUBMENU; } - LPCTSTR data; + BYTE* pData; + #if wxUSE_OWNER_DRAWN - if ( IsOwnerDrawn() ) + if (IsOwnerDrawn()) { - flagsOld |= MF_OWNERDRAW; - data = (LPCTSTR)this; + uFlagsOld |= MIS_OWNERDRAW; + pData = (BYTE*)this; } else #endif //owner drawn { - flagsOld |= MF_STRING; - data = strName; + uFlagsOld |= MIS_TEXT; + pData = (BYTE*)Text.c_str(); + } + + // + // Set the style + // + if (!::WinSendMsg( hMenu + ,MM_SETITEM + ,MPFROM2SHORT(uId, TRUE) + ,(MPARAM)&vItem + )) + { + wxLogLastError(wxT("ModifyMenu")); } - if ( ::ModifyMenu(hMenu, id, - MF_BYCOMMAND | flagsOld, - id, data) == 0xFFFFFFFF ) + // + // 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 +// ---------------------------------------------------------------------------- + +wxMenuItem* wxMenuItemBase::New( + wxMenu* pParentMenu +, int nId +, const wxString& rName +, const wxString& rHelp +, bool bIsCheckable +, wxMenu* pSubMenu +) +{ + return new wxMenuItem( pParentMenu + ,nId + ,rName + ,rHelp + ,bIsCheckable + ,pSubMenu + ); +} // end of wxMenuItemBase::New