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

compatibility constructors for wxMenuItem() taking bool instead of wxItemKind

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14739 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-03-23 01:23:11 +00:00
parent fbf456aa89
commit 2368dcda39
6 changed files with 131 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/wx/gtk/menuitem.h
View File

@@ -52,7 +52,18 @@ public:
wxString GetHotKey() const { return m_hotKey; }
// compatibility only, don't use in new code
wxMenuItem(wxMenu *parentMenu,
int id,
const wxString& text,
const wxString& help,
bool isCheckable,
wxMenu *subMenu = (wxMenu *)NULL);
private:
// common part of all ctors
void Init();
// DoSetText() transforms the accel mnemonics in our label from MSW/wxWin
// style to GTK+ and is called from ctor and SetText()
void DoSetText(const wxString& text);

11
include/wx/gtk1/menuitem.h
View File

@@ -52,7 +52,18 @@ public:
wxString GetHotKey() const { return m_hotKey; }
// compatibility only, don't use in new code
wxMenuItem(wxMenu *parentMenu,
int id,
const wxString& text,
const wxString& help,
bool isCheckable,
wxMenu *subMenu = (wxMenu *)NULL);
private:
// common part of all ctors
void Init();
// DoSetText() transforms the accel mnemonics in our label from MSW/wxWin
// style to GTK+ and is called from ctor and SetText()
void DoSetText(const wxString& text);

11
include/wx/msw/menuitem.h
View File

@@ -67,7 +67,18 @@ public:
m_endRadioGroup = end;
}
// compatibility only, don't use in new code
wxMenuItem(wxMenu *parentMenu,
int id,
const wxString& text,
const wxString& help,
bool isCheckable,
wxMenu *subMenu = (wxMenu *)NULL);
private:
// common part of all ctors
void Init();
// the positions of the first and last items of the radio group this item
// belongs to or -1
int m_startRadioGroup,

19
src/gtk/menu.cpp
View File

@@ -712,11 +712,28 @@ wxMenuItem::wxMenuItem(wxMenu *parentMenu,
wxItemKind kind,
wxMenu *subMenu)
: wxMenuItemBase(parentMenu, id, text, help, kind, subMenu)
{
Init();
}
wxMenuItem::wxMenuItem(wxMenu *parentMenu,
int id,
const wxString& text,
const wxString& help,
bool isCheckable,
wxMenu *subMenu)
: wxMenuItemBase(parentMenu, id, text, help,
isCheckable ? wxITEM_CHECK : wxITEM_NORMAL, subMenu)
{
Init();
}
void wxMenuItem::Init()
{
m_labelWidget = (GtkWidget *) NULL;
m_menuItem = (GtkWidget *) NULL;
DoSetText(text);
DoSetText(m_text);
}
wxMenuItem::~wxMenuItem()

19
src/gtk1/menu.cpp
View File

@@ -712,11 +712,28 @@ wxMenuItem::wxMenuItem(wxMenu *parentMenu,
wxItemKind kind,
wxMenu *subMenu)
: wxMenuItemBase(parentMenu, id, text, help, kind, subMenu)
{
Init();
}
wxMenuItem::wxMenuItem(wxMenu *parentMenu,
int id,
const wxString& text,
const wxString& help,
bool isCheckable,
wxMenu *subMenu)
: wxMenuItemBase(parentMenu, id, text, help,
isCheckable ? wxITEM_CHECK : wxITEM_NORMAL, subMenu)
{
Init();
}
void wxMenuItem::Init()
{
m_labelWidget = (GtkWidget *) NULL;
m_menuItem = (GtkWidget *) NULL;
DoSetText(text);
DoSetText(m_text);
}
wxMenuItem::~wxMenuItem()

22
src/msw/menuitem.cpp
View File

@@ -92,8 +92,26 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu,
, wxOwnerDrawn(GetLabelFromText(text), kind == wxITEM_CHECK)
#endif // owner drawn
{
wxASSERT_MSG( pParentMenu != NULL, wxT("a menu item should have a parent") );
Init();
}
wxMenuItem::wxMenuItem(wxMenu *parentMenu,
int id,
const wxString& text,
const wxString& help,
bool isCheckable,
wxMenu *subMenu)
: wxMenuItemBase(parentMenu, id, text, help,
isCheckable ? wxITEM_CHECK : wxITEM_NORMAL, subMenu)
#if wxUSE_OWNER_DRAWN
, wxOwnerDrawn(GetLabelFromText(text), isCheckable)
#endif // owner drawn
{
Init();
}
void wxMenuItem::Init()
{
m_startRadioGroup =
m_endRadioGroup = -1;
@@ -110,7 +128,7 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu,
ResetOwnerDrawn();
// tell the owner drawing code to to show the accel string as well
SetAccelString(text.AfterFirst(_T('\t')));
SetAccelString(m_text.AfterFirst(_T('\t')));
#endif // wxUSE_OWNER_DRAWN
}