Support using GetTextExtent() with empty string to get descent in wxOSX.

[wxWidgets.git] / include / wx / univ / statusbr.h

diff --git a/include/wx/univ/statusbr.h b/include/wx/univ/statusbr.h
index f9ee1261b1781d39c8e6f7703c63bc2cce8b69a7..2e64113113e3ed20c49348c4128eb21ddf49e9fe 100644 (file)
--- a/include/wx/univ/statusbr.h
+++ b/include/wx/univ/statusbr.h
@@ -19,8 +19,7 @@
 // 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(); }
@@ -40,20 +39,13 @@ public:
                 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);
-
-    // 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;
 
@@ -62,6 +54,8 @@ public:
         { return const_cast<wxStatusBar*>(this); }
 
 protected:
+    virtual void DoUpdateStatusText(int i);
+
     // recalculate the field widths
     void OnSize(wxSizeEvent& event);
 
@@ -87,9 +81,6 @@ 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();