X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..320c341a1017798148ace98f7416c8a3cc902c04:/src/os2/menuitem.cpp diff --git a/src/os2/menuitem.cpp b/src/os2/menuitem.cpp index 1d960c605b..87bac21267 100644 --- a/src/os2/menuitem.cpp +++ b/src/os2/menuitem.cpp @@ -54,44 +54,6 @@ #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 // ============================================================================ @@ -100,11 +62,7 @@ static wxString TextToLabel(const wxString& rTitle) // 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 @@ -116,25 +74,69 @@ static wxString TextToLabel(const wxString& rTitle) 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( TextToLabel(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)); @@ -143,21 +145,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 = TextToLabel(rText); - m_isCheckable = bCheckable; - m_help = rStrHelp; - memset(&m_vMenuData, '\0', sizeof(m_vMenuData)); - m_vMenuData.id= nId; -} // 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() { @@ -190,35 +185,55 @@ bool wxMenuItem::IsChecked() const } // end of wxMenuItem::IsChecked wxString wxMenuItemBase::GetLabelFromText( - const wxString& rText + const wxString& rsText ) { - wxString label; - for ( const wxChar *pc = rText.c_str(); *pc; pc++ ) + wxString sLabel; + + for (const char* zPc = rsText.c_str(); *zPc; zPc++) { - if ( *pc == wxT('~') || *pc == wxT('&') ) + if (*zPc == wxT('~') || *zPc == wxT('&')) { - // '~' is the escape character for GTK+ and '&' is the one for + // + // '~' is the escape character for OS/2PM and '&' is the one for // wxWindows - skip both of them + // continue; } - - label += *pc; + sLabel += *zPc; } - return label; -} - -// accelerators -// ------------ + return sLabel; +} // end of wxMenuItemBase::GetLabelFromText -#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 // ----------------- @@ -256,21 +271,95 @@ 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::Node* pNode = rItems.Item(nStart); + + for (int n = nStart; n <= nEnd && pNode; n++) + { + if (n == nPos) + { + ::WinSendMsg( hMenu + ,MM_SETITEMATTR + ,MPFROM2SHORT(n, TRUE) + ,MPFROM2SHORT(MIA_CHECKED, MIA_CHECKED) + ); + } + if (n != nPos) + { + pNode->GetData()->m_isChecked = FALSE; + ::WinSendMsg( hMenu + ,MM_SETITEMATTR + ,MPFROM2SHORT(n, TRUE) + ,MPFROM2SHORT(MIA_CHECKED, FALSE) + ); + } + pNode = pNode->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("CheckMenuItem"); @@ -286,14 +375,17 @@ void wxMenuItem::SetText( // Don't do anything if label didn't change // - wxString Text = TextToLabel(rText); - if (m_text == Text) + wxString sText = wxPMTextToLabel(rText); + if (m_text == sText) return; - wxMenuItemBase::SetText(Text); - OWNER_DRAWN_ONLY(wxOwnerDrawn::SetName(Text)); + wxMenuItemBase::SetText(sText); + OWNER_DRAWN_ONLY(wxOwnerDrawn::SetName(sText)); +#if wxUSE_OWNER_DRAWN + SetAccelString(rText.AfterFirst(_T('\t'))); +#endif // wxUSE_OWNER_DRAWN - HWND hMenu = GetHMenuOf(m_parentMenu); + HWND hMenu = GetHmenuOf(m_parentMenu); wxCHECK_RET(hMenu, wxT("menuitem without menu")); @@ -333,7 +425,7 @@ void wxMenuItem::SetText( #endif //owner drawn { uFlagsOld |= MIS_TEXT; - pData = (BYTE*)Text.c_str(); + pData = (BYTE*)sText.c_str(); } // @@ -379,7 +471,7 @@ wxMenuItem* wxMenuItemBase::New( , int nId , const wxString& rName , const wxString& rHelp -, bool bIsCheckable +, wxItemKind kind , wxMenu* pSubMenu ) { @@ -387,7 +479,7 @@ wxMenuItem* wxMenuItemBase::New( ,nId ,rName ,rHelp - ,bIsCheckable + ,kind ,pSubMenu ); } // end of wxMenuItemBase::New