don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/generic/statusbr.h b/include/wx/generic/statusbr.h
index 709e58faa69c7915373b4260ade9be966c1700f1..8568f88cd423e4bdac65b7a97005438895fef7ba 100644 (file)
--- a/include/wx/generic/statusbr.h
+++ b/include/wx/generic/statusbr.h
@@ -12,16 +12,25 @@
 #ifndef _WX_GENERIC_STATUSBR_H_
 #define _WX_GENERIC_STATUSBR_H_
 
+#include "wx/defs.h"
+
+#if wxUSE_STATUSBAR
+
 #include "wx/pen.h"
 #include "wx/arrstr.h"
 
-class WXDLLEXPORT wxStatusBarGeneric : public wxStatusBarBase
+
+// ----------------------------------------------------------------------------
+// wxStatusBarGeneric
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_CORE wxStatusBarGeneric : public wxStatusBarBase
 {
 public:
     wxStatusBarGeneric() { Init(); }
     wxStatusBarGeneric(wxWindow *parent,
                        wxWindowID winid = wxID_ANY,
-                       long style = wxST_SIZEGRIP,
+                       long style = wxSTB_DEFAULT_STYLE,
                        const wxString& name = wxStatusBarNameStr)
     {
         Init();
@@ -32,7 +41,7 @@ public:
     virtual ~wxStatusBarGeneric();
 
     bool Create(wxWindow *parent, wxWindowID winid = wxID_ANY,
-                long style = wxST_SIZEGRIP,
+                long style = wxSTB_DEFAULT_STYLE,
                 const wxString& name = wxStatusBarNameStr);
 
     // Create status line
@@ -41,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[]);
@@ -55,38 +63,52 @@ 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);
+    // implementation only (not part of wxStatusBar public API):
 
-    void SetBorderX(int x);
-    void SetBorderY(int y);
+    int GetFieldFromPoint(const wxPoint& point) const;
+
+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
+    // wxSTB_SIZEGRIP style and the window it is attached to must be resizeable
+    // and not maximized
+    bool ShowsSizeGrip() const;
+
+    // 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;
     int               m_borderY;
+
     wxPen             m_mediumShadowPen;
     wxPen             m_hilightPen;
 
@@ -97,5 +119,7 @@ private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxStatusBarGeneric)
 };
 
+#endif // wxUSE_STATUSBAR
+
 #endif
     // _WX_GENERIC_STATUSBR_H_