mark long-deprecated ctor as such

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53809 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/menuitem.h b/include/wx/gtk/menuitem.h
index 4133cc5e834f7804e7fb55940c0fa729fe613837..d8cbbd17981365749d3d9a8c844987ecae5f0866 100644 (file)
--- a/include/wx/gtk/menuitem.h
+++ b/include/wx/gtk/menuitem.h
@@ -53,13 +53,17 @@ public:
     // and in the hotkey which is used to set given pointer
     static wxString GTKProcessMenuItemLabel(const wxString& str, wxString *hotKey);
 
     // and in the hotkey which is used to set given pointer
     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,
                int id,
                const wxString& text,
                const wxString& help,
                bool isCheckable,
     wxMenuItem(wxMenu *parentMenu,
                int id,
                const wxString& text,
                const wxString& help,
                bool isCheckable,

-               wxMenu *subMenu = (wxMenu *)NULL);
+               wxMenu *subMenu = NULL)
+    );
+#endif

 
 private:
     // common part of all ctors
 
 private:
     // common part of all ctors

diff --git a/include/wx/msw/menuitem.h b/include/wx/msw/menuitem.h
index ed147b7cca74542e21e5c39db294c7595a147e2b..4518daf143f4fdf88e1bdc2ee95b597cec335f63 100644 (file)
--- a/include/wx/msw/menuitem.h
+++ b/include/wx/msw/menuitem.h
@@ -64,13 +64,17 @@ public:
     void SetRadioGroupStart(int start);
     void SetRadioGroupEnd(int end);
 
     void SetRadioGroupStart(int start);
     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,
                int id,
                const wxString& text,
                const wxString& help,
                bool isCheckable,
     wxMenuItem(wxMenu *parentMenu,
                int id,
                const wxString& text,
                const wxString& help,
                bool isCheckable,

-               wxMenu *subMenu = (wxMenu *)NULL);
+               wxMenu *subMenu = NULL)
+    );
+#endif

 
 private:
     // common part of all ctors
 
 private:
     // common part of all ctors

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index 4f203d694dc45d2db155c4146626195a726b3834..153a5ce3d9f0993e9e54b69f0a0aa5d91a818d8f 100644 (file)
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -607,6 +607,7 @@ wxMenuItem::wxMenuItem(wxMenu *parentMenu,
     Init(text);
 }
 
     Init(text);
 }
 

+#if WXWIN_COMPATIBILITY_2_8

 wxMenuItem::wxMenuItem(wxMenu *parentMenu,
                        int id,
                        const wxString& text,
 wxMenuItem::wxMenuItem(wxMenu *parentMenu,
                        int id,
                        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)
 {

diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp
index d5ef1dc4e7f2b9e021c4c2ae5b14db45e1669516..d1ecba43323ee4042c1135c7413dd83e76c8332f 100644 (file)
--- a/src/msw/menuitem.cpp
+++ b/src/msw/menuitem.cpp
@@ -137,6 +137,7 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu,
     Init();
 }
 
     Init();
 }
 

+#if WXWIN_COMPATIBILITY_2_8

 wxMenuItem::wxMenuItem(wxMenu *parentMenu,
                        int id,
                        const wxString& text,
 wxMenuItem::wxMenuItem(wxMenu *parentMenu,
                        int id,
                        const wxString& text,


@@ -151,6 +152,7 @@ wxMenuItem::wxMenuItem(wxMenu *parentMenu,
 {
     Init();
 }
 {
     Init();
 }

+#endif

 
 void wxMenuItem::Init()
 {
 
 void wxMenuItem::Init()
 {