GetRegion is not needed anymore

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

diff --git a/include/wx/generic/statusbr.h b/include/wx/generic/statusbr.h
index d2b134391815a9f370f1ed2ecb8b92252a32a637..13d309423c0a4c37c358febdc62a0aca48a22e94 100644 (file)
--- a/include/wx/generic/statusbr.h
+++ b/include/wx/generic/statusbr.h
@@ -19,7 +19,12 @@
 #include "wx/pen.h"
 #include "wx/arrstr.h"
 
 #include "wx/pen.h"
 #include "wx/arrstr.h"
 

-class WXDLLEXPORT wxStatusBarGeneric : public wxStatusBarBase
+
+// ----------------------------------------------------------------------------
+// wxStatusBarGeneric
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_CORE wxStatusBarGeneric : public wxStatusBarBase

 {
 public:
     wxStatusBarGeneric() { Init(); }
 {
 public:
     wxStatusBarGeneric() { Init(); }


@@ -45,7 +50,6 @@ public:
 
     // Set status line text
     virtual void SetStatusText(const wxString& text, int number = 0);
 
     // 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[]);
 
     // 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; }
 
     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 OnPaint(wxPaintEvent& event);

+    void OnSize(wxSizeEvent& event);

 
     void OnLeftDown(wxMouseEvent& event);
     void OnRightDown(wxMouseEvent& event);
 
 
     void OnLeftDown(wxMouseEvent& event);
     void OnRightDown(wxMouseEvent& event);
 

-    virtual void InitColours();
-

     // Responds to colour changes
     void OnSysColourChanged(wxSysColourChangedEvent& event);
 
     // 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;
 
     // 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();
 
     // 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;
     wxArrayInt        m_widthsAbs;
 
     int               m_borderX;