X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6f02a879ed7efc5fcf6328ff47a1352ec82812b7..7e08bc5acd8ee4e2f0756f50bf98937a118f9951:/include/wx/univ/statusbr.h diff --git a/include/wx/univ/statusbr.h b/include/wx/univ/statusbr.h index 79116f1919..bb5d3435f5 100644 --- a/include/wx/univ/statusbr.h +++ b/include/wx/univ/statusbr.h @@ -16,10 +16,10 @@ #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 WXDLLEXPORT wxStatusBarUniv : public wxStatusBarBase, +class WXDLLIMPEXP_CORE wxStatusBarUniv : public wxStatusBarBase, public wxInputConsumer { public: @@ -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;