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

Deprecate old style wxPanel ctor taking separate coordinates.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2011-03-20 00:00:42 +00:00
parent 5b87bd6c0b
commit cf858bab79
3 changed files with 37 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/wx/generic/panelg.h
View File

@@ -17,16 +17,6 @@ class WXDLLIMPEXP_CORE wxPanel : public wxPanelBase
public: public:
wxPanel() { } 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 // Constructor
wxPanel(wxWindow *parent, wxPanel(wxWindow *parent,
wxWindowID winid = wxID_ANY, wxWindowID winid = wxID_ANY,
@@ -38,6 +28,18 @@ public:
Create(parent, winid, pos, size, style, name); 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: private:
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel); wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel);
}; };

21
include/wx/msw/panel.h
View File

@@ -20,14 +20,6 @@ class WXDLLIMPEXP_CORE wxPanel : public wxPanelBase
public: public:
wxPanel() { } 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, wxPanel(wxWindow *parent,
wxWindowID winid = wxID_ANY, wxWindowID winid = wxID_ANY,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
@@ -43,6 +35,19 @@ public:
// show through the child panels. // show through the child panels.
virtual bool HasTransparentBackground(); 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: private:
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel); wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel);
}; };

20
include/wx/univ/panel.h
View File

@@ -20,14 +20,6 @@ class WXDLLIMPEXP_CORE wxPanel : public wxPanelBase
public: public:
wxPanel() { } 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, wxPanel(wxWindow *parent,
wxWindowID winid = wxID_ANY, wxWindowID winid = wxID_ANY,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
@@ -40,6 +32,18 @@ public:
virtual bool IsCanvasWindow() const { return true; } 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: private:
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel); wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel);
}; };