X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..a881f34e499feadfef915b9d4c80e45a73ba37d4:/include/wx/univ/statbox.h?ds=sidebyside diff --git a/include/wx/univ/statbox.h b/include/wx/univ/statbox.h index fd8ff41262..eb1cb116c8 100644 --- a/include/wx/univ/statbox.h +++ b/include/wx/univ/statbox.h @@ -12,11 +12,7 @@ #ifndef _WX_UNIV_STATBOX_H_ #define _WX_UNIV_STATBOX_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "univstatbox.h" -#endif - -class WXDLLEXPORT wxStaticBox : public wxStaticBoxBase +class WXDLLIMPEXP_CORE wxStaticBox : public wxStaticBoxBase { public: wxStaticBox() { } @@ -26,7 +22,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize) { - Create(parent, -1, label, pos, size); + Create(parent, wxID_ANY, label, pos, size); } wxStaticBox(wxWindow *parent, wxWindowID id, @@ -51,8 +47,10 @@ public: // take account of this virtual wxPoint GetBoxAreaOrigin() const; - virtual bool HasTransparentBackground() { return TRUE; } - + // returning true from here ensures that we act as a container window for + // our children + virtual bool IsStaticBox() const { return true; } + protected: // draw the control virtual void DoDraw(wxControlRenderer *renderer); @@ -60,10 +58,6 @@ protected: // get the size of the border wxRect GetBorderGeometry() const; - // returning TRUE from here ensures that we act as a container window for - // our children - virtual bool IsStaticBox() const { return TRUE; } - private: DECLARE_DYNAMIC_CLASS(wxStaticBox) };