X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/57de237383704a47eb3948422a9fec0967869b9d..f196316400fd247a760b2ef77d5064b4e10e5471:/include/wx/msw/statbr95.h?ds=sidebyside diff --git a/include/wx/msw/statbr95.h b/include/wx/msw/statbr95.h index fa5866e19b..3b26a1fa3a 100644 --- a/include/wx/msw/statbr95.h +++ b/include/wx/msw/statbr95.h @@ -12,10 +12,6 @@ #ifndef _STATBR95_H #define _STATBR95_H -#ifdef __GNUG__ -#pragma interface "statbr95.h" -#endif - #if wxUSE_NATIVE_STATUSBAR class WXDLLEXPORT wxStatusBar95 : public wxStatusBarBase @@ -24,17 +20,17 @@ public: // ctors and such wxStatusBar95(); wxStatusBar95(wxWindow *parent, - wxWindowID id = -1, + wxWindowID id = wxID_ANY, long style = wxST_SIZEGRIP, - const wxString& name = wxEmptyString) + const wxString& name = wxStatusBarNameStr) { (void)Create(parent, id, style, name); } bool Create(wxWindow *parent, - wxWindowID id = -1, + wxWindowID id = wxID_ANY, long style = wxST_SIZEGRIP, - const wxString& name = wxEmptyString); + const wxString& name = wxStatusBarNameStr); virtual ~wxStatusBar95(); @@ -48,6 +44,9 @@ public: // set status line fields' widths virtual void SetStatusWidths(int n, const int widths_field[]); + // set status line fields' styles + virtual void SetStatusStyles(int n, const int styles[]); + // sets the minimal vertical size of the status bar virtual void SetMinHeight(int height); @@ -58,12 +57,16 @@ public: virtual int GetBorderX() const; virtual int GetBorderY() const; + virtual WXLRESULT MSWWindowProc(WXUINT nMsg, + WXWPARAM wParam, + WXLPARAM lParam); protected: void CopyFieldsWidth(const int widths[]); void SetFieldsWidth(); - // override base class virtual - void DoMoveWindow(int x, int y, int width, int height); + // override some base class virtuals + virtual wxSize DoGetBestSize() const; + virtual void DoMoveWindow(int x, int y, int width, int height); private: DECLARE_DYNAMIC_CLASS_NO_COPY(wxStatusBar95)