no real change; just add the standard separator where it's missing

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

diff --git a/include/wx/generic/statusbr.h b/include/wx/generic/statusbr.h
index 4b195104f06782b014c8b3e52ebcb2e2c5a9f375..13d309423c0a4c37c358febdc62a0aca48a22e94 100644 (file)
--- a/include/wx/generic/statusbr.h
+++ b/include/wx/generic/statusbr.h
@@ -50,7 +50,6 @@ public:
 
     // Set status line text
     virtual void SetStatusText(const wxString& text, int number = 0);
-    virtual wxString GetStatusText(int number = 0) const;
 
     // Set status line widths
     virtual void SetStatusWidths(int n, const int widths_field[]);
@@ -65,24 +64,27 @@ public:
     virtual int GetBorderY() const { return m_borderY; }
 
 
-protected:
-
-    virtual void DrawFieldText(wxDC& dc, int i);
-    virtual void DrawField(wxDC& dc, int i);
-
-    void SetBorderX(int x);
-    void SetBorderY(int y);
+protected:      // event handlers
 
     void OnPaint(wxPaintEvent& event);
+    void OnSize(wxSizeEvent& event);
 
     void OnLeftDown(wxMouseEvent& event);
     void OnRightDown(wxMouseEvent& event);
 
-    virtual void InitColours();
-
     // Responds to colour changes
     void OnSysColourChanged(wxSysColourChangedEvent& event);
 
+protected:
+
+    virtual void DrawFieldText(wxDC& dc, const wxRect& rc, int i, int textHeight);
+    virtual void DrawField(wxDC& dc, int i, int textHeight);
+
+    void SetBorderX(int x);
+    void SetBorderY(int y);
+
+    virtual void InitColours();
+
     // true if the status bar shows the size grip: for this it must have
     // wxST_SIZEGRIP style and the window it is attached to must be resizeable
     // and not maximized
@@ -94,11 +96,8 @@ protected:
     // common part of all ctors
     void Init();
 
-    // the array of the currently displayed strings
-    wxArrayString     m_statusStrings;
-
-    // the last known width of the client rect (used to rebuild cache)
-    int               m_lastClientWidth;
+    // the last known height of the client rect
+    int               m_lastClientHeight;
 
     // the absolute widths of the status bar panes in pixels
     wxArrayInt        m_widthsAbs;