set eol-style

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

diff --git a/include/wx/univ/statusbr.h b/include/wx/univ/statusbr.h
index 804029fbc14d587826206cf59f3cdfaea3af4e29..79116f1919cc047c6b0d87a7c1f2959b954fb1e6 100644 (file)
--- a/include/wx/univ/statusbr.h
+++ b/include/wx/univ/statusbr.h
@@ -12,9 +12,8 @@
 #ifndef _WX_UNIV_STATUSBR_H_
 #define _WX_UNIV_STATUSBR_H_
 
-#ifdef __GNUG__
-    #pragma interface "univstatusbr.h"
-#endif
+#include "wx/univ/inpcons.h"
+#include "wx/arrstr.h"
 
 // ----------------------------------------------------------------------------
 // wxStatusBar: a window near the bottom of the frame used for status info
@@ -27,7 +26,7 @@ public:
     wxStatusBarUniv() { Init(); }
 
     wxStatusBarUniv(wxWindow *parent,
-                    wxWindowID id = -1,
+                    wxWindowID id = wxID_ANY,
                     long style = 0,
                     const wxString& name = wxPanelNameStr)
     {
@@ -37,7 +36,7 @@ public:
     }
 
     bool Create(wxWindow *parent,
-                wxWindowID id = -1,
+                wxWindowID id = wxID_ANY,
                 long style = 0,
                 const wxString& name = wxPanelNameStr);
 
@@ -59,6 +58,10 @@ public:
     virtual int GetBorderX() const;
     virtual int GetBorderY() const;
 
+    // wxInputConsumer pure virtual
+    virtual wxWindow *GetInputWindow() const
+        { return wx_const_cast(wxStatusBar*, this); }
+
 protected:
     // recalculate the field widths
     void OnSize(wxSizeEvent& event);
@@ -66,10 +69,6 @@ protected:
     // draw the statusbar
     virtual void DoDraw(wxControlRenderer *renderer);
 
-    // wxInputConsumer pure virtual
-    virtual wxWindow *GetInputWindow() const
-        { return wxConstCast(this, wxStatusBar); }
-
     // tell them about our preferred height
     virtual wxSize DoGetBestSize() const;
 
@@ -86,6 +85,9 @@ protected:
     // also updates m_widthsAbs if necessary
     wxRect GetTotalFieldRect(wxCoord *borderBetweenFields);
 
+    // get the rect for this field without ani side effects (see code)
+    wxRect DoGetFieldRect(int n) const;
+
     // refresh the given field
     void RefreshField(int i);