X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab4fece809e006a55c61361dadb63aca87ccb0d8..6811c2f3e3e8afc1872280dfd1464565a3ddb306:/src/os2/menuitem.cpp diff --git a/src/os2/menuitem.cpp b/src/os2/menuitem.cpp index b54fd5783c..87bac21267 100644 --- a/src/os2/menuitem.cpp +++ b/src/os2/menuitem.cpp @@ -54,40 +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.c_str(); *pc != wxT('\0'); pc++ ) - { - if (*pc == wxT('&') ) - { - if (*(pc+1) == wxT('&')) - { - pc++; - Title << wxT('&'); - } - else - 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 // ============================================================================ @@ -115,18 +81,20 @@ wxMenuItem::wxMenuItem( ) : wxMenuItemBase( pParentMenu ,nId - ,rsText + ,wxPMTextToLabel(rsText) ,rsHelp ,eKind ,pSubMenu ) #if wxUSE_OWNER_DRAWN -, wxOwnerDrawn( TextToLabel(rsText) +, 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; Init(); } // end of wxMenuItem::wxMenuItem @@ -141,18 +109,20 @@ wxMenuItem::wxMenuItem( ) : wxMenuItemBase( pParentMenu ,nId - ,rsText + ,wxPMTextToLabel(rsText) ,rsHelp ,bIsCheckable ? wxITEM_CHECK : wxITEM_NORMAL ,pSubMenu ) #if wxUSE_OWNER_DRAWN -, wxOwnerDrawn( TextToLabel(rsText) +, 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 @@ -171,12 +141,11 @@ void wxMenuItem::Init() 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 @@ -216,27 +185,30 @@ 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; -} + return sLabel; +} // end of wxMenuItemBase::GetLabelFromText -// radio group stuff +// +// Radio group stuff // ----------------- - +// void wxMenuItem::SetAsRadioGroupStart() { m_bIsRadioGroupStart = TRUE; @@ -246,19 +218,20 @@ void wxMenuItem::SetRadioGroupStart( int nStart ) { - wxASSERT_MSG( !m_bIsRadioGroupStart, - _T("should only be called for the next radio items") ); + wxASSERT_MSG( !m_bIsRadioGroupStart + ,_T("should only be called for the next radio items") + ); m_vRadioGroup.m_nStart = nStart; -} // end of wxMenuItem::SetRadioGroupStart +} // wxMenuItem::SetRadioGroupStart void wxMenuItem::SetRadioGroupEnd( int nEnd ) { - wxASSERT_MSG( m_bIsRadioGroupStart, - _T("should only be called for the first radio item") ); - + wxASSERT_MSG( m_bIsRadioGroupStart + ,_T("should only be called for the first radio item") + ); m_vRadioGroup.m_nEnd = nEnd; } // end of wxMenuItem::SetRadioGroupEnd @@ -302,9 +275,9 @@ void wxMenuItem::Check( if (m_isChecked == bCheck) return; - HMENU hMenu = GetHMenuOf(m_parentMenu); + HMENU hMenu = GetHmenuOf(m_parentMenu); - if ( GetKind() == wxITEM_RADIO ) + if (GetKind() == wxITEM_RADIO) { // // It doesn't make sense to uncheck a radio item - what would this do? @@ -317,23 +290,26 @@ void wxMenuItem::Check( // 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?") ); + 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 + // + // We already have all information we need + // nStart = nPos; - nEnd = m_vRadioGroup.m_nEnd; + nEnd = m_vRadioGroup.m_nEnd; } - else // Next radio group item + else // next radio group item { // // Get the radio group end from the start item @@ -349,26 +325,22 @@ void wxMenuItem::Check( 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) - ); + ::WinSendMsg( hMenu + ,MM_SETITEMATTR + ,MPFROM2SHORT(n, TRUE) + ,MPFROM2SHORT(MIA_CHECKED, MIA_CHECKED) + ); } - else + if (n != nPos) { - bOk = (bool)::WinSendMsg( hMenu - ,MM_SETITEMATTR - ,MPFROM2SHORT(n, TRUE) - ,MPFROM2SHORT(MIA_CHECKED, FALSE) - ); + pNode->GetData()->m_isChecked = FALSE; + ::WinSendMsg( hMenu + ,MM_SETITEMATTR + ,MPFROM2SHORT(n, TRUE) + ,MPFROM2SHORT(MIA_CHECKED, FALSE) + ); } pNode = pNode->GetNext(); } @@ -376,13 +348,13 @@ void wxMenuItem::Check( else // check item { if (bCheck) - bOk = (bool)::WinSendMsg( GetHMenuOf(m_parentMenu) + bOk = (bool)::WinSendMsg( hMenu ,MM_SETITEMATTR ,MPFROM2SHORT(GetRealId(), TRUE) ,MPFROM2SHORT(MIA_CHECKED, MIA_CHECKED) ); else - bOk = (bool)::WinSendMsg( GetHMenuOf(m_parentMenu) + bOk = (bool)::WinSendMsg( hMenu ,MM_SETITEMATTR ,MPFROM2SHORT(GetRealId(), TRUE) ,MPFROM2SHORT(MIA_CHECKED, FALSE) @@ -403,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")); @@ -450,7 +425,7 @@ void wxMenuItem::SetText( #endif //owner drawn { uFlagsOld |= MIS_TEXT; - pData = (BYTE*)Text.c_str(); + pData = (BYTE*)sText.c_str(); } //