X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/914589c26ced86ffa672171ee476e1740538fbb8..b2680ced12cbbed16990007c5fa3ea7730700122:/src/os2/menuitem.cpp?ds=sidebyside diff --git a/src/os2/menuitem.cpp b/src/os2/menuitem.cpp index 03ee6f9b5d..193a679348 100644 --- a/src/os2/menuitem.cpp +++ b/src/os2/menuitem.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: menuitem.cpp +// Name: src/os2/menuitem.cpp // Purpose: wxMenuItem implementation // Author: David Webster // Modified by: @@ -13,27 +13,23 @@ // headers & declarations // ============================================================================ -#ifdef __GNUG__ - #pragma implementation "menuitem.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#include "wx/menuitem.h" +#include "wx/stockitem.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" + #include "wx/log.h" #endif -#include "wx/menuitem.h" -#include "wx/log.h" - #if wxUSE_ACCEL #include "wx/accel.h" #endif // wxUSE_ACCEL @@ -62,11 +58,7 @@ // dynamic classes implementation // ---------------------------------------------------------------------------- - #if wxUSE_OWNER_DRAWN - IMPLEMENT_DYNAMIC_CLASS2(wxMenuItem, wxMenuItemBase, wxOwnerDrawn) - #else //!USE_OWNER_DRAWN - IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxMenuItemBase) - #endif //USE_OWNER_DRAWN +IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject) // ---------------------------------------------------------------------------- // wxMenuItem @@ -78,25 +70,69 @@ wxMenuItem::wxMenuItem( wxMenu* pParentMenu , int nId -, const wxString& rText -, const wxString& rStrHelp -, bool bCheckable +, const wxString& rsText +, const wxString& rsHelp +, wxItemKind eKind , wxMenu* pSubMenu ) +: wxMenuItemBase( pParentMenu + ,nId + ,wxPMTextToLabel(rsText) + ,rsHelp + ,eKind + ,pSubMenu + ) #if wxUSE_OWNER_DRAWN -: wxOwnerDrawn( rText - ,bCheckable +, wxOwnerDrawn( wxPMTextToLabel(rsText) + ,eKind == wxITEM_CHECK ) #endif // owner drawn { wxASSERT_MSG(pParentMenu != NULL, wxT("a menu item should have a parent")); + memset(&m_vMenuData, '\0', sizeof(m_vMenuData)); + m_vMenuData.id = (USHORT)nId; -#if wxUSE_OWNER_DRAWN + Init(); +} // end of wxMenuItem::wxMenuItem + +wxMenuItem::wxMenuItem( + wxMenu* pParentMenu +, int nId +, const wxString& rsText +, const wxString& rsHelp +, bool bIsCheckable +, wxMenu* pSubMenu +) +: wxMenuItemBase( pParentMenu + ,nId + ,wxPMTextToLabel(rsText) + ,rsHelp + ,bIsCheckable ? wxITEM_CHECK : wxITEM_NORMAL + ,pSubMenu + ) +#if wxUSE_OWNER_DRAWN +, wxOwnerDrawn( wxPMTextToLabel(rsText) + ,bIsCheckable + ) +#endif // owner drawn +{ + wxASSERT_MSG(pParentMenu != NULL, wxT("a menu item should have a parent")); + memset(&m_vMenuData, '\0', sizeof(m_vMenuData)); + m_vMenuData.id = (USHORT)nId; + + Init(); +} // end of wxMenuItem::wxMenuItem + +void wxMenuItem::Init() +{ + m_vRadioGroup.m_nStart = -1; + m_bIsRadioGroupStart = FALSE; +#if wxUSE_OWNER_DRAWN // // Set default menu colors // - #define SYS_COLOR(c) (wxSystemSettings::GetSystemColour(wxSYS_COLOUR_##c)) + #define SYS_COLOR(c) (wxSystemSettings::GetColour(wxSYS_COLOUR_##c)) SetTextColour(SYS_COLOR(MENUTEXT)); SetBackgroundColour(SYS_COLOR(MENU)); @@ -105,19 +141,14 @@ wxMenuItem::wxMenuItem( // 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 = nId; - m_text = rText; - m_isCheckable = bCheckable; - m_help = rStrHelp; -} // end of wxMenuItem::wxMenuItem + // + // Tell the owner drawing code to to show the accel string as well + // + SetAccelString(m_text.AfterFirst(_T('\t'))); +#endif // wxUSE_OWNER_DRAWN +} // end of wxMenuItem::Init wxMenuItem::~wxMenuItem() { @@ -140,33 +171,65 @@ int wxMenuItem::GetRealId() const // -------------- bool wxMenuItem::IsChecked() const { - USHORT uFlag = SHORT1FROMMR(::WinSendMsg( GetHMenuOf(m_parentMenu) - ,MM_QUERYITEMATTR - ,MPFROM2SHORT(GetId(), TRUE) - ,MPFROMSHORT(MIA_CHECKED) - )); + USHORT uFlag = SHORT1FROMMR(::WinSendMsg( GetHMenuOf(m_parentMenu) + ,MM_QUERYITEMATTR + ,MPFROM2SHORT(GetId(), TRUE) + ,MPFROMSHORT(MIA_CHECKED) + )); - return (uFlag & MIA_CHECKED); + return (uFlag & MIA_CHECKED) == MIA_CHECKED ; } // end of wxMenuItem::IsChecked -wxString wxMenuItemBase::GetLabelFromText( - const wxString& rText +wxString wxMenuItemBase::GetLabelText( + const wxString& rsText ) { - return wxStripMenuCodes(rText); -} + wxString sLabel; -// accelerators -// ------------ + for (const wxChar* zPc = rsText.c_str(); *zPc; zPc++) + { + if (*zPc == wxT('~') || *zPc == wxT('&')) + { + // + // '~' is the escape character for OS/2PM and '&' is the one for + // wxWidgets - skip both of them + // + continue; + } + sLabel += *zPc; + } + return sLabel; +} // end of wxMenuItemBase::GetLabelText -#if wxUSE_ACCEL +// +// Radio group stuff +// ----------------- +// +void wxMenuItem::SetAsRadioGroupStart() +{ + m_bIsRadioGroupStart = true; +} // end of wxMenuItem::SetAsRadioGroupStart -wxAcceleratorEntry *wxMenuItem::GetAccel() const +void wxMenuItem::SetRadioGroupStart( + int nStart +) { - return wxGetAccelFromString(GetText()); -} + wxASSERT_MSG( !m_bIsRadioGroupStart + ,_T("should only be called for the next radio items") + ); -#endif // wxUSE_ACCEL + m_vRadioGroup.m_nStart = nStart; +} // wxMenuItem::SetRadioGroupStart + +void wxMenuItem::SetRadioGroupEnd( + int nEnd +) +{ + wxASSERT_MSG( m_bIsRadioGroupStart + ,_T("should only be called for the first radio item") + ); + m_vRadioGroup.m_nEnd = nEnd; +} // end of wxMenuItem::SetRadioGroupEnd // change item state // ----------------- @@ -183,17 +246,17 @@ void wxMenuItem::Enable( bOk = (bool)::WinSendMsg( GetHMenuOf(m_parentMenu) ,MM_SETITEMATTR ,MPFROM2SHORT(GetRealId(), TRUE) - ,MPFROM2SHORT(MIA_DISABLED, MIA_DISABLED) + ,MPFROM2SHORT(MIA_DISABLED, FALSE) ); else bOk = (bool)::WinSendMsg( GetHMenuOf(m_parentMenu) ,MM_SETITEMATTR ,MPFROM2SHORT(GetRealId(), TRUE) - ,MPFROM2SHORT(MIA_DISABLED, FALSE) + ,MPFROM2SHORT(MIA_DISABLED, MIA_DISABLED) ); if (!bOk) { - wxLogLastError("EnableMenuItem"); + wxLogLastError(wxT("EnableMenuItem")); } wxMenuItemBase::Enable(bEnable); } // end of wxMenuItem::Enable @@ -204,42 +267,127 @@ void wxMenuItem::Check( { bool bOk; - wxCHECK_RET( m_isCheckable, wxT("only checkable items may be checked") ); + wxCHECK_RET( 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) - ); + + HMENU hMenu = GetHmenuOf(m_parentMenu); + + if (GetKind() == wxITEM_RADIO) + { + // + // It doesn't make sense to uncheck a radio item - what would this do? + // + if (!bCheck) + return; + + // + // Get the index of this item in the menu + // + const wxMenuItemList& rItems = m_parentMenu->GetMenuItems(); + int nPos = rItems.IndexOf(this); + + wxCHECK_RET( nPos != wxNOT_FOUND + ,_T("menuitem not found in the menu items list?") + ); + + // + // Get the radio group range + // + int nStart; + int nEnd; + + if (m_bIsRadioGroupStart) + { + // + // We already have all information we need + // + nStart = nPos; + nEnd = m_vRadioGroup.m_nEnd; + } + else // next radio group item + { + // + // Get the radio group end from the start item + // + nStart = m_vRadioGroup.m_nStart; + nEnd = rItems.Item(nStart)->GetData()->m_vRadioGroup.m_nEnd; + } + + // + // Also uncheck all the other items in this radio group + // + wxMenuItemList::compatibility_iterator node = rItems.Item(nStart); + + for (int n = nStart; n <= nEnd && node; n++) + { + if (n == nPos) + { + ::WinSendMsg( hMenu + ,MM_SETITEMATTR + ,MPFROM2SHORT(n, TRUE) + ,MPFROM2SHORT(MIA_CHECKED, MIA_CHECKED) + ); + } + if (n != nPos) + { + node->GetData()->m_isChecked = FALSE; + ::WinSendMsg( hMenu + ,MM_SETITEMATTR + ,MPFROM2SHORT(n, TRUE) + ,MPFROM2SHORT(MIA_CHECKED, FALSE) + ); + } + node = node->GetNext(); + } + } + else // check item + { + if (bCheck) + bOk = (bool)::WinSendMsg( hMenu + ,MM_SETITEMATTR + ,MPFROM2SHORT(GetRealId(), TRUE) + ,MPFROM2SHORT(MIA_CHECKED, MIA_CHECKED) + ); + else + bOk = (bool)::WinSendMsg( hMenu + ,MM_SETITEMATTR + ,MPFROM2SHORT(GetRealId(), TRUE) + ,MPFROM2SHORT(MIA_CHECKED, FALSE) + ); + } if (!bOk) { - wxLogLastError("EnableMenuItem"); + wxLogLastError(wxT("CheckMenuItem")); } wxMenuItemBase::Check(bCheck); } // end of wxMenuItem::Check -void wxMenuItem::SetText( - const wxString& rText -) +void wxMenuItem::SetItemLabel( const wxString& rText ) { // // Don't do anything if label didn't change // - if (m_text == rText) + + wxString sText = wxPMTextToLabel(rText); + if (m_text == sText) return; - wxMenuItemBase::SetText(rText); - OWNER_DRAWN_ONLY(wxOwnerDrawn::SetName(rText)); + // wxMenuItemBase will do stock ID checks + wxMenuItemBase::SetItemLabel(sText); - HWND hMenu = GetHMenuOf(m_parentMenu); + // m_text could now be different from 'text' if we are a stock menu item, + // so use only m_text below + + OWNER_DRAWN_ONLY(wxOwnerDrawn::SetName(m_text)); +#if wxUSE_OWNER_DRAWN + if (rText.IsEmpty()) + SetAccelString(m_text.AfterFirst(_T('\t'))); + else + SetAccelString(rText.AfterFirst(_T('\t'))); +#endif // wxUSE_OWNER_DRAWN + + HWND hMenu = GetHmenuOf(m_parentMenu); wxCHECK_RET(hMenu, wxT("menuitem without menu")); @@ -247,9 +395,9 @@ void wxMenuItem::SetText( m_parentMenu->UpdateAccel(this); #endif // wxUSE_ACCEL - USHORT uId = GetRealId(); - MENUITEM vItem; - USHORT uFlagsOld; + USHORT uId = (USHORT)GetRealId(); + MENUITEM vItem; + USHORT uFlagsOld; if (!::WinSendMsg( hMenu ,MM_QUERYITEM @@ -257,7 +405,7 @@ void wxMenuItem::SetText( ,(MPARAM)&vItem )) { - wxLogLastError("GetMenuState"); + wxLogLastError(wxT("GetMenuState")); } else { @@ -267,19 +415,19 @@ void wxMenuItem::SetText( uFlagsOld |= MIS_SUBMENU; } - BYTE* pData; + char* pData; #if wxUSE_OWNER_DRAWN if (IsOwnerDrawn()) { uFlagsOld |= MIS_OWNERDRAW; - pData = (BYTE*)this; + pData = (char*)this; } else #endif //owner drawn { uFlagsOld |= MIS_TEXT; - pData = (BYTE*)rText.c_str(); + pData = (char*) m_text.wx_str(); } // @@ -325,7 +473,7 @@ wxMenuItem* wxMenuItemBase::New( , int nId , const wxString& rName , const wxString& rHelp -, bool bIsCheckable +, wxItemKind kind , wxMenu* pSubMenu ) { @@ -333,8 +481,7 @@ wxMenuItem* wxMenuItemBase::New( ,nId ,rName ,rHelp - ,bIsCheckable + ,kind ,pSubMenu ); } // end of wxMenuItemBase::New -