#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
// ============================================================================
// 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
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( 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 = rText;
- m_isCheckable = bCheckable;
- m_help = rStrHelp;
-} // end of wxMenuItem::wxMenuItem
+} // end of wxMenuItem::Init
wxMenuItem::~wxMenuItem()
{
const wxString& rText
)
{
- return wxStripMenuCodes(rText);
+ 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;
}
-// 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
// -----------------
if (m_isEnabled == bEnable)
return;
if (bEnable)
- bOk = ::WinSendMsg( GetHMenuOf(m_parentMenu)
- ,MM_SETITEMATTR
- ,MPFROM2SHORT(GetRealId(), TRUE)
- ,MPFROM2SHORT(MIA_DISABLED, MIA_DISABLED)
- );
+ bOk = (bool)::WinSendMsg( GetHMenuOf(m_parentMenu)
+ ,MM_SETITEMATTR
+ ,MPFROM2SHORT(GetRealId(), TRUE)
+ ,MPFROM2SHORT(MIA_DISABLED, FALSE)
+ );
else
- bOk = ::WinSendMsg( GetHMenuOf(m_parentMenu)
- ,MM_SETITEMATTR
- ,MPFROM2SHORT(GetRealId(), TRUE)
- ,MPFROM2SHORT(MIA_DISABLED, FALSE)
- );
+ bOk = (bool)::WinSendMsg( GetHMenuOf(m_parentMenu)
+ ,MM_SETITEMATTR
+ ,MPFROM2SHORT(GetRealId(), TRUE)
+ ,MPFROM2SHORT(MIA_DISABLED, MIA_DISABLED)
+ );
if (!bOk)
{
wxLogLastError("EnableMenuItem");
{
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 = ::WinSendMsg( GetHMenuOf(m_parentMenu)
- ,MM_SETITEMATTR
- ,MPFROM2SHORT(GetRealId(), TRUE)
- ,MPFROM2SHORT(MIA_CHECKED, MIA_CHECKED)
- );
- else
- bOk = ::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
//
// Don't do anything if label didn't change
//
- if (m_text == rText)
+
+ wxString sText = TextToLabel(rText);
+ if (m_text == sText)
return;
- wxMenuItemBase::SetText(rText);
- OWNER_DRAWN_ONLY(wxOwnerDrawn::SetName(rText));
+ 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"));
USHORT uId = GetRealId();
MENUITEM vItem;
USHORT uFlagsOld;
-
+
if (!::WinSendMsg( hMenu
,MM_QUERYITEM
,MPFROM2SHORT(uId, TRUE)
#endif //owner drawn
{
uFlagsOld |= MIS_TEXT;
- pData = (BYTE*)rText.c_str();
+ pData = (BYTE*)sText.c_str();
}
//
, int nId
, const wxString& rName
, const wxString& rHelp
-, bool bIsCheckable
+, wxItemKind kind
, wxMenu* pSubMenu
)
{
,nId
,rName
,rHelp
- ,bIsCheckable
+ ,kind
,pSubMenu
);
} // end of wxMenuItemBase::New
projects / wxWidgets.git / blobdiff