X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b33b72819002e038a2a0cb2b3aa9b2cde880c7a..e0fbcda633e7307c0de5e12e1060303c744cb8ea:/src/os2/menuitem.cpp?ds=sidebyside diff --git a/src/os2/menuitem.cpp b/src/os2/menuitem.cpp index af97aab35a..3e0f891a09 100644 --- a/src/os2/menuitem.cpp +++ b/src/os2/menuitem.cpp @@ -62,7 +62,7 @@ static wxString TextToLabel(const wxString& rTitle) { wxString Title; const wxChar *pc; - for (pc = rTitle; *pc != wxT('\0'); pc++ ) + for (pc = rTitle.c_str(); *pc != wxT('\0'); pc++ ) { if (*pc == wxT('&') ) { @@ -71,13 +71,9 @@ static wxString TextToLabel(const wxString& rTitle) pc++; Title << wxT('&'); } - else + else Title << wxT('~'); } -// else if (*pc == wxT('/')) -// { -// Title << wxT('\\'); -// } else { if ( *pc == wxT('~') ) @@ -100,11 +96,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,46 +108,82 @@ 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 + ,TextToLabel(rsText) + ,rsHelp + ,eKind + ,pSubMenu + ) #if wxUSE_OWNER_DRAWN -: wxOwnerDrawn( TextToLabel(rText) - ,bCheckable +, wxOwnerDrawn( TextToLabel(rsText) + ,eKind == wxITEM_CHECK ) #endif // owner drawn { wxASSERT_MSG(pParentMenu != NULL, wxT("a menu item should have a parent")); -#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 + ,TextToLabel(rsText) + ,rsHelp + ,bIsCheckable ? wxITEM_CHECK : wxITEM_NORMAL + ,pSubMenu + ) +#if wxUSE_OWNER_DRAWN +, wxOwnerDrawn( TextToLabel(rsText) + ,bIsCheckable + ) +#endif // owner drawn +{ + wxASSERT_MSG(pParentMenu != NULL, wxT("a menu item should have a parent")); + 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)); + #undef SYS_COLOR + // // We don't want normal items be owner-drawn // ResetOwnerDrawn(); - #undef SYS_COLOR + // + // Tell the owner drawing code to to show the accel string as well + // + SetAccelString(m_text.AfterFirst(_T('\t'))); #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; -} // end of wxMenuItem::wxMenuItem +} // end of wxMenuItem::Init wxMenuItem::~wxMenuItem() { @@ -206,17 +234,33 @@ wxString wxMenuItemBase::GetLabelFromText( return label; } -// accelerators -// ------------ +// radio group stuff +// ----------------- -#if wxUSE_ACCEL +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; +} // end of 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 // ----------------- @@ -233,13 +277,13 @@ 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) { @@ -254,24 +298,99 @@ 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); + int nStart; + int nEnd; + + wxCHECK_RET( nPos != wxNOT_FOUND, + _T("menuitem not found in the menu items list?") ); + + // + // Get the radio group range + // + + 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) + { + pNode->GetData()->m_isChecked = FALSE; + } + + if (n == nPos) + { + bOk = (bool)::WinSendMsg( hMenu + ,MM_SETITEMATTR + ,MPFROM2SHORT(n, TRUE) + ,MPFROM2SHORT(MIA_CHECKED, MIA_CHECKED) + ); + } + else + { + bOk = (bool)::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("EnableMenuItem"); + wxLogLastError("CheckMenuItem"); } wxMenuItemBase::Check(bCheck); } // end of wxMenuItem::Check @@ -284,14 +403,14 @@ void wxMenuItem::SetText( // Don't do anything if label didn't change // - wxString Text = TextToLabel(rText); - if (m_text == Text) + wxString sText = TextToLabel(rText); + if (m_text == sText) return; - wxMenuItemBase::SetText(Text); - OWNER_DRAWN_ONLY(wxOwnerDrawn::SetName(Text)); + wxMenuItemBase::SetText(sText); + OWNER_DRAWN_ONLY(wxOwnerDrawn::SetName(sText)); - HWND hMenu = GetHMenuOf(m_parentMenu); + HWND hMenu = GetHmenuOf(m_parentMenu); wxCHECK_RET(hMenu, wxT("menuitem without menu")); @@ -331,7 +450,7 @@ void wxMenuItem::SetText( #endif //owner drawn { uFlagsOld |= MIS_TEXT; - pData = (BYTE*)Text.c_str(); + pData = (BYTE*)sText.c_str(); } // @@ -377,7 +496,7 @@ wxMenuItem* wxMenuItemBase::New( , int nId , const wxString& rName , const wxString& rHelp -, bool bIsCheckable +, wxItemKind kind , wxMenu* pSubMenu ) { @@ -385,7 +504,7 @@ wxMenuItem* wxMenuItemBase::New( ,nId ,rName ,rHelp - ,bIsCheckable + ,kind ,pSubMenu ); } // end of wxMenuItemBase::New