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,16 +17,6 @@ class WXDLLIMPEXP_CORE wxPanel : public wxPanelBase public: wxPanel() { } - // Old-style constructor (no default values for coordinates to avoid - // ambiguity with the new one) - 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); - } - // Constructor wxPanel(wxWindow *parent, wxWindowID winid = wxID_ANY, @@ -38,6 +28,18 @@ public: Create(parent, winid, pos, size, style, name); } +#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/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); };