Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commited FRM's stockitem patch (empty stock items).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40978 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2006-09-03 12:23:04 +00:00
parent eae0338fcb
commit ee0a94cfc2
24 changed files with 534 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/msw/menuitem.cpp
View File

@@ -27,6 +27,7 @@
#if wxUSE_MENUS
#include "wx/menuitem.h"
#include "wx/stockitem.h"
#ifndef WX_PRECOMP
#include "wx/font.h"
@@ -153,6 +154,12 @@ wxMenuItem::wxMenuItem(wxMenu *parentMenu,
void wxMenuItem::Init()
{
if (m_text.IsEmpty())
{
wxASSERT_MSG(wxIsStockId(GetId()), wxT("A non-stock menu item with an empty label?"));
m_text = wxGetStockLabel(GetId(), wxSTOCK_WITH_ACCELERATOR|wxSTOCK_WITH_MNEMONIC);
}
m_radioGroup.start = -1;
m_isRadioGroupStart = false;
@@ -336,12 +343,20 @@ void wxMenuItem::Check(bool check)
wxMenuItemBase::Check(check);
}
void wxMenuItem::SetText(const wxString& text)
void wxMenuItem::SetText(const wxString& txt)
{
wxString text = txt;
// don't do anything if label didn't change
if ( m_text == text )
if ( m_text == txt )
return;
if (text.IsEmpty())
{
wxASSERT_MSG(wxIsStockId(GetId()), wxT("A non-stock menu item with an empty label?"));
text = wxGetStockLabel(GetId(), wxSTOCK_WITH_ACCELERATOR|wxSTOCK_WITH_MNEMONIC);
}
wxMenuItemBase::SetText(text);
OWNER_DRAWN_ONLY( wxOwnerDrawn::SetName(text) );
#if wxUSE_OWNER_DRAWN