X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53a2db124c633f80bdb16336084262037d879a2c..9b49405777342458dc1666001865eef7309b6c30:/include/wx/generic/statusbr.h

diff --git a/include/wx/generic/statusbr.h b/include/wx/generic/statusbr.h
index 2f58f2b93e..13d309423c 100644
--- a/include/wx/generic/statusbr.h
+++ b/include/wx/generic/statusbr.h
@@ -19,6 +19,11 @@
 #include "wx/pen.h"
 #include "wx/arrstr.h"
 
+
+// ----------------------------------------------------------------------------
+// wxStatusBarGeneric
+// ----------------------------------------------------------------------------
+
 class WXDLLIMPEXP_CORE wxStatusBarGeneric : public wxStatusBarBase
 {
 public:
@@ -45,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[]);
@@ -59,39 +63,43 @@ public:
     virtual int GetBorderX() const { return m_borderX; }
     virtual int GetBorderY() const { return m_borderY; }
 
-    ////////////////////////////////////////////////////////////////////////
-    // Implementation
-
-    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
     bool ShowsSizeGrip() const;
 
-protected:
+    // returns the position and the size of the size grip
+    wxRect GetSizeGripRect() const;
+
     // common part of all ctors
     void Init();
 
-    wxArrayString     m_statusStrings;
+    // the last known height of the client rect
+    int               m_lastClientHeight;
 
-    // the last known width of the client rect (used to rebuild cache)
-    int               m_lastClientWidth;
-    // the widths of the status bar panes in pixels
+    // the absolute widths of the status bar panes in pixels
     wxArrayInt        m_widthsAbs;
 
     int               m_borderX;