X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..57e2b887a0e798ab5ab2921cdeba550f322b000c:/include/wx/univ/statusbr.h diff --git a/include/wx/univ/statusbr.h b/include/wx/univ/statusbr.h index 85baa6e44f..79116f1919 100644 --- a/include/wx/univ/statusbr.h +++ b/include/wx/univ/statusbr.h @@ -12,10 +12,6 @@ #ifndef _WX_UNIV_STATUSBR_H_ #define _WX_UNIV_STATUSBR_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "univstatusbr.h" -#endif - #include "wx/univ/inpcons.h" #include "wx/arrstr.h" @@ -30,7 +26,7 @@ public: wxStatusBarUniv() { Init(); } wxStatusBarUniv(wxWindow *parent, - wxWindowID id = -1, + wxWindowID id = wxID_ANY, long style = 0, const wxString& name = wxPanelNameStr) { @@ -40,7 +36,7 @@ public: } bool Create(wxWindow *parent, - wxWindowID id = -1, + wxWindowID id = wxID_ANY, long style = 0, const wxString& name = wxPanelNameStr); @@ -62,6 +58,10 @@ public: virtual int GetBorderX() const; virtual int GetBorderY() const; + // wxInputConsumer pure virtual + virtual wxWindow *GetInputWindow() const + { return wx_const_cast(wxStatusBar*, this); } + protected: // recalculate the field widths void OnSize(wxSizeEvent& event); @@ -69,10 +69,6 @@ protected: // draw the statusbar virtual void DoDraw(wxControlRenderer *renderer); - // wxInputConsumer pure virtual - virtual wxWindow *GetInputWindow() const - { return wxConstCast(this, wxStatusBar); } - // tell them about our preferred height virtual wxSize DoGetBestSize() const;