X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53a2db124c633f80bdb16336084262037d879a2c..e143fb636d50d5802dcc8c7c2e9e8e2944afa467:/include/wx/univ/statusbr.h diff --git a/include/wx/univ/statusbr.h b/include/wx/univ/statusbr.h index 88528562a3..bb5d3435f5 100644 --- a/include/wx/univ/statusbr.h +++ b/include/wx/univ/statusbr.h @@ -16,7 +16,7 @@ #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, @@ -46,7 +46,6 @@ public: // 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; @@ -60,7 +59,7 @@ public: // wxInputConsumer pure virtual virtual wxWindow *GetInputWindow() const - { return wx_const_cast(wxStatusBar*, this); } + { return const_cast(this); } protected: // recalculate the field widths @@ -95,8 +94,8 @@ protected: 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;