From cf858bab79c18d709b3fa3375202c2ddf3d599e5 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 20 Mar 2011 00:00:42 +0000
Subject: [PATCH] Deprecate old style wxPanel ctor taking separate coordinates.

wxPanel had a ctor in very old (wx 1.x-compatible?) style which was marked as
"old" and not documented but not officially deprecated. Do deprecate it now in
view of removing it in later releases.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67252 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/generic/panelg.h | 20 +++++++++++---------
 include/wx/msw/panel.h      | 21 +++++++++++++--------
 include/wx/univ/panel.h     | 20 ++++++++++++--------
 3 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h
index 3c815485f2..9376b27adf 100644
--- a/include/wx/generic/panelg.h
+++ b/include/wx/generic/panelg.h
@@ -17,26 +17,28 @@ class WXDLLIMPEXP_CORE wxPanel : public wxPanelBase
 public:
     wxPanel() { }
 
-    // Old-style constructor (no default values for coordinates to avoid
-    // ambiguity with the new one)
+    // Constructor
     wxPanel(wxWindow *parent,
-            int x, int y, int width, int height,
+            wxWindowID winid = wxID_ANY,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize,
             long style = wxTAB_TRAVERSAL | wxNO_BORDER,
             const wxString& name = wxPanelNameStr)
     {
-        Create(parent, wxID_ANY, wxPoint(x, y), wxSize(width, height), style, name);
+        Create(parent, winid, pos, size, style, name);
     }
 
-    // Constructor
+#ifdef WXWIN_COMPATIBILITY_2_8
+    wxDEPRECATED_CONSTRUCTOR(
     wxPanel(wxWindow *parent,
-            wxWindowID winid = wxID_ANY,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
+            int x, int y, int width, int height,
             long style = wxTAB_TRAVERSAL | wxNO_BORDER,
             const wxString& name = wxPanelNameStr)
     {
-        Create(parent, winid, pos, size, style, name);
+        Create(parent, wxID_ANY, wxPoint(x, y), wxSize(width, height), style, name);
     }
+    )
+#endif // WXWIN_COMPATIBILITY_2_8
 
 private:
     wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel);
diff --git a/include/wx/msw/panel.h b/include/wx/msw/panel.h
index 3e24bd8223..a061720078 100644
--- a/include/wx/msw/panel.h
+++ b/include/wx/msw/panel.h
@@ -20,14 +20,6 @@ class WXDLLIMPEXP_CORE wxPanel : public wxPanelBase
 public:
     wxPanel() { }
 
-    wxPanel(wxWindow *parent,
-            int x, int y, int width, int height,
-            long style = wxTAB_TRAVERSAL | wxNO_BORDER,
-            const wxString& name = wxPanelNameStr)
-    {
-        Create(parent, wxID_ANY, wxPoint(x, y), wxSize(width, height), style, name);
-    }
-
     wxPanel(wxWindow *parent,
             wxWindowID winid = wxID_ANY,
             const wxPoint& pos = wxDefaultPosition,
@@ -43,6 +35,19 @@ public:
     // show through the child panels.
     virtual bool HasTransparentBackground();
 
+
+#ifdef WXWIN_COMPATIBILITY_2_8
+    wxDEPRECATED_CONSTRUCTOR(
+    wxPanel(wxWindow *parent,
+            int x, int y, int width, int height,
+            long style = wxTAB_TRAVERSAL | wxNO_BORDER,
+            const wxString& name = wxPanelNameStr)
+    {
+        Create(parent, wxID_ANY, wxPoint(x, y), wxSize(width, height), style, name);
+    }
+    )
+#endif // WXWIN_COMPATIBILITY_2_8
+
 private:
     wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel);
 };
diff --git a/include/wx/univ/panel.h b/include/wx/univ/panel.h
index 5217bcbcd8..19f0d52dc0 100644
--- a/include/wx/univ/panel.h
+++ b/include/wx/univ/panel.h
@@ -20,14 +20,6 @@ class WXDLLIMPEXP_CORE wxPanel : public wxPanelBase
 public:
     wxPanel() { }
 
-    wxPanel(wxWindow *parent,
-            int x, int y, int width, int height,
-            long style = wxTAB_TRAVERSAL | wxNO_BORDER,
-            const wxString& name = wxPanelNameStr)
-    {
-        Create(parent, wxID_ANY, wxPoint(x, y), wxSize(width, height), style, name);
-    }
-
     wxPanel(wxWindow *parent,
             wxWindowID winid = wxID_ANY,
             const wxPoint& pos = wxDefaultPosition,
@@ -40,6 +32,18 @@ public:
 
     virtual bool IsCanvasWindow() const { return true; }
 
+#ifdef WXWIN_COMPATIBILITY_2_8
+    wxDEPRECATED_CONSTRUCTOR(
+    wxPanel(wxWindow *parent,
+            int x, int y, int width, int height,
+            long style = wxTAB_TRAVERSAL | wxNO_BORDER,
+            const wxString& name = wxPanelNameStr)
+    {
+        Create(parent, wxID_ANY, wxPoint(x, y), wxSize(width, height), style, name);
+    }
+    )
+#endif // WXWIN_COMPATIBILITY_2_8
+
 private:
     wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel);
 };
-- 
2.47.2