X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53a2db124c633f80bdb16336084262037d879a2c..880d76dfb12d4e8466df30d641bb25c6f71bd398:/include/wx/univ/statusbr.h?ds=sidebyside diff --git a/include/wx/univ/statusbr.h b/include/wx/univ/statusbr.h index 88528562a3..2e64113113 100644 --- a/include/wx/univ/statusbr.h +++ b/include/wx/univ/statusbr.h @@ -16,18 +16,17 @@ #include "wx/arrstr.h" // ---------------------------------------------------------------------------- -// wxStatusBar: a window near the bottom of the frame used for status info +// wxStatusBarUniv: a window near the bottom of the frame used for status info // ---------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxStatusBarUniv : public wxStatusBarBase, - public wxInputConsumer +class WXDLLIMPEXP_CORE wxStatusBarUniv : public wxStatusBarBase { public: wxStatusBarUniv() { Init(); } wxStatusBarUniv(wxWindow *parent, wxWindowID id = wxID_ANY, - long style = 0, + long style = wxSTB_DEFAULT_STYLE, const wxString& name = wxPanelNameStr) { Init(); @@ -37,32 +36,26 @@ public: bool Create(wxWindow *parent, wxWindowID id = wxID_ANY, - long style = 0, + long style = wxSTB_DEFAULT_STYLE, const wxString& name = wxPanelNameStr); - // set field count/widths + // implement base class methods virtual void SetFieldsCount(int number = 1, const int *widths = NULL); virtual void SetStatusWidths(int n, const int widths[]); - // get/set the text of the given field - virtual void SetStatusText(const wxString& text, int number = 0); - virtual wxString GetStatusText(int number = 0) const; - - // Get the position and size of the field's internal bounding rectangle virtual bool GetFieldRect(int i, wxRect& rect) const; - - // sets the minimal vertical size of the status bar virtual void SetMinHeight(int height); - // get the dimensions of the horizontal and vertical borders virtual int GetBorderX() const; virtual int GetBorderY() const; // wxInputConsumer pure virtual virtual wxWindow *GetInputWindow() const - { return wx_const_cast(wxStatusBar*, this); } + { return const_cast(this); } protected: + virtual void DoUpdateStatusText(int i); + // recalculate the field widths void OnSize(wxSizeEvent& event); @@ -88,15 +81,12 @@ protected: // get the rect for this field without ani side effects (see code) wxRect DoGetFieldRect(int n) const; - // refresh the given field - void RefreshField(int i); - // common part of all ctors void Init(); private: - // the status fields strings - wxArrayString m_statusText; + // the current status fields strings + //wxArrayString m_statusText; // the absolute status fields widths wxArrayInt m_widthsAbs;