Move m_labelWin to wxStaticBoxBase itself

It will be reused by all platforms and is not specific to wxGTK.

This also means WXDestroyWithoutChildren() doesn't need to be virtual
any longer.
This commit is contained in:
Vadim Zeitlin
2017-12-20 00:03:55 +01:00
parent 7c849276f8
commit 8c06a24da4
4 changed files with 16 additions and 37 deletions

View File

@@ -18,7 +18,6 @@ class WXDLLIMPEXP_CORE wxStaticBox : public wxStaticBoxBase
public:
wxStaticBox()
{
Init();
}
wxStaticBox( wxWindow *parent,
@@ -29,8 +28,6 @@ public:
long style = 0,
const wxString &name = wxStaticBoxNameStr )
{
Init();
Create( parent, id, label, pos, size, style, name );
}
@@ -42,8 +39,6 @@ public:
long style = 0,
const wxString &name = wxStaticBoxNameStr )
{
Init();
Create( parent, id, label, pos, size, style, name );
}
@@ -82,15 +77,7 @@ public:
virtual void AddChild( wxWindowBase *child ) wxOVERRIDE;
virtual void WXDestroyWithoutChildren() wxOVERRIDE;
protected:
// Common part of all ctors.
void Init()
{
m_labelWin = NULL;
}
// Common implementation of both Create() overloads: exactly one of
// labelStr and labelWin parameters must be non-null.
bool DoCreate(wxWindow *parent,
@@ -107,10 +94,6 @@ protected:
void DoApplyWidgetStyle(GtkRcStyle *style) wxOVERRIDE;
// If non-null, the window used as our label. This window is owned by the
// static box and will be deleted when it is.
wxWindow* m_labelWin;
wxDECLARE_DYNAMIC_CLASS(wxStaticBox);
};