X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7183e38becd5121af4c96ceabd62fa71746442f5..682214d5c6ec3e56dbdfd0c97d70d87e614b38c2:/include/wx/generic/statline.h?ds=sidebyside diff --git a/include/wx/generic/statline.h b/include/wx/generic/statline.h index 5d3dafa675..a2993d8f84 100644 --- a/include/wx/generic/statline.h +++ b/include/wx/generic/statline.h @@ -11,8 +11,8 @@ #ifndef _WX_GENERIC_STATLINE_H_ #define _WX_GENERIC_STATLINE_H_ -#ifdef __GNUG__ - #pragma interface +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) + #pragma interface "statline.h" #endif class wxStaticBox; @@ -27,10 +27,10 @@ class WXDLLEXPORT wxStaticLine : public wxStaticLineBase public: // constructors and pseudo-constructors - wxStaticLine() { } + wxStaticLine() { m_statbox = NULL; } wxStaticLine( wxWindow *parent, - wxWindowID id, + wxWindowID id = wxID_ANY, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, long style = wxLI_HORIZONTAL, @@ -39,8 +39,10 @@ public: Create(parent, id, pos, size, style, name); } + virtual ~wxStaticLine(); + bool Create( wxWindow *parent, - wxWindowID id, + wxWindowID id = wxID_ANY, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, long style = wxLI_HORIZONTAL, @@ -50,7 +52,11 @@ public: // will want to return the main widget for m_statbox // WXWidget GetMainWidget() const; - + + // override wxWindow methods to make things work + virtual void DoSetSize(int x, int y, int width, int height, + int sizeFlags = wxSIZE_AUTO); + virtual void DoMoveWindow(int x, int y, int width, int height); protected: // we implement the static line using a static box wxStaticBox *m_statbox;