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

@@ -49,12 +49,16 @@ public:
//
// Reparent all children of the static box under its parent and destroy the
// box itself.
virtual void WXDestroyWithoutChildren();
void WXDestroyWithoutChildren();
protected:
// choose the default border for this window
virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
// 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_NO_COPY_CLASS(wxStaticBoxBase);
};