mark long-deprecated ctor as such
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53809 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -53,13 +53,17 @@ public:
|
|||||||
// and in the hotkey which is used to set given pointer
|
// and in the hotkey which is used to set given pointer
|
||||||
static wxString GTKProcessMenuItemLabel(const wxString& str, wxString *hotKey);
|
static wxString GTKProcessMenuItemLabel(const wxString& str, wxString *hotKey);
|
||||||
|
|
||||||
|
#if WXWIN_COMPATIBILITY_2_8
|
||||||
// compatibility only, don't use in new code
|
// compatibility only, don't use in new code
|
||||||
|
wxDEPRECATED(
|
||||||
wxMenuItem(wxMenu *parentMenu,
|
wxMenuItem(wxMenu *parentMenu,
|
||||||
int id,
|
int id,
|
||||||
const wxString& text,
|
const wxString& text,
|
||||||
const wxString& help,
|
const wxString& help,
|
||||||
bool isCheckable,
|
bool isCheckable,
|
||||||
wxMenu *subMenu = (wxMenu *)NULL);
|
wxMenu *subMenu = NULL)
|
||||||
|
);
|
||||||
|
#endif
|
||||||
|
|
||||||
private:
|
private:
|
||||||
// common part of all ctors
|
// common part of all ctors
|
||||||
|
@@ -64,13 +64,17 @@ public:
|
|||||||
void SetRadioGroupStart(int start);
|
void SetRadioGroupStart(int start);
|
||||||
void SetRadioGroupEnd(int end);
|
void SetRadioGroupEnd(int end);
|
||||||
|
|
||||||
|
#if WXWIN_COMPATIBILITY_2_8
|
||||||
// compatibility only, don't use in new code
|
// compatibility only, don't use in new code
|
||||||
|
wxDEPRECATED(
|
||||||
wxMenuItem(wxMenu *parentMenu,
|
wxMenuItem(wxMenu *parentMenu,
|
||||||
int id,
|
int id,
|
||||||
const wxString& text,
|
const wxString& text,
|
||||||
const wxString& help,
|
const wxString& help,
|
||||||
bool isCheckable,
|
bool isCheckable,
|
||||||
wxMenu *subMenu = (wxMenu *)NULL);
|
wxMenu *subMenu = NULL)
|
||||||
|
);
|
||||||
|
#endif
|
||||||
|
|
||||||
private:
|
private:
|
||||||
// common part of all ctors
|
// common part of all ctors
|
||||||
|
@@ -607,6 +607,7 @@ wxMenuItem::wxMenuItem(wxMenu *parentMenu,
|
|||||||
Init(text);
|
Init(text);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if WXWIN_COMPATIBILITY_2_8
|
||||||
wxMenuItem::wxMenuItem(wxMenu *parentMenu,
|
wxMenuItem::wxMenuItem(wxMenu *parentMenu,
|
||||||
int id,
|
int id,
|
||||||
const wxString& text,
|
const wxString& text,
|
||||||
@@ -618,6 +619,7 @@ wxMenuItem::wxMenuItem(wxMenu *parentMenu,
|
|||||||
{
|
{
|
||||||
Init(text);
|
Init(text);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
void wxMenuItem::Init(const wxString& text)
|
void wxMenuItem::Init(const wxString& text)
|
||||||
{
|
{
|
||||||
|
@@ -137,6 +137,7 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu,
|
|||||||
Init();
|
Init();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if WXWIN_COMPATIBILITY_2_8
|
||||||
wxMenuItem::wxMenuItem(wxMenu *parentMenu,
|
wxMenuItem::wxMenuItem(wxMenu *parentMenu,
|
||||||
int id,
|
int id,
|
||||||
const wxString& text,
|
const wxString& text,
|
||||||
@@ -151,6 +152,7 @@ wxMenuItem::wxMenuItem(wxMenu *parentMenu,
|
|||||||
{
|
{
|
||||||
Init();
|
Init();
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
void wxMenuItem::Init()
|
void wxMenuItem::Init()
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user