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 4b195104f06782b014c8b3e52ebcb2e2c5a9f375..8568f88cd423e4bdac65b7a97005438895fef7ba 100644 (file)
--- a/include/wx/generic/statusbr.h
+++ b/include/wx/generic/statusbr.h
@@ -30,7 +30,7 @@ public:
     wxStatusBarGeneric() { Init(); }
     wxStatusBarGeneric(wxWindow *parent,
                        wxWindowID winid = wxID_ANY,
     wxStatusBarGeneric() { Init(); }
     wxStatusBarGeneric(wxWindow *parent,
                        wxWindowID winid = wxID_ANY,

-                       long style = wxST_SIZEGRIP,
+                       long style = wxSTB_DEFAULT_STYLE,

                        const wxString& name = wxStatusBarNameStr)
     {
         Init();
                        const wxString& name = wxStatusBarNameStr)
     {
         Init();


@@ -41,7 +41,7 @@ public:
     virtual ~wxStatusBarGeneric();
 
     bool Create(wxWindow *parent, wxWindowID winid = wxID_ANY,
     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
                 const wxString& name = wxStatusBarNameStr);
 
     // Create status line


@@ -50,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[]);


@@ -65,26 +64,33 @@ public:
     virtual int GetBorderY() const { return m_borderY; }
 
 
     virtual int GetBorderY() const { return m_borderY; }
 
 

-protected:
+    // implementation only (not part of wxStatusBar public API):

 
 

-    virtual void DrawFieldText(wxDC& dc, int i);
-    virtual void DrawField(wxDC& dc, int i);
+    int GetFieldFromPoint(const wxPoint& point) const;

 
 

-    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
     // 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
+    // wxSTB_SIZEGRIP style and the window it is attached to must be resizeable

     // and not maximized
     bool ShowsSizeGrip() const;
 
     // and not maximized
     bool ShowsSizeGrip() const;
 


@@ -94,17 +100,15 @@ protected:
     // common part of all ctors
     void Init();
 
     // 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;
 
     int               m_borderX;
     int               m_borderY;
 
     // 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;
 
     wxPen             m_mediumShadowPen;
     wxPen             m_hilightPen;