X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..07b6378fcb2fade6cb360254beeccf2bc81f4a36:/include/wx/univ/statusbr.h?ds=sidebyside

diff --git a/include/wx/univ/statusbr.h b/include/wx/univ/statusbr.h
index c493ae7cc5..79116f1919 100644
--- a/include/wx/univ/statusbr.h
+++ b/include/wx/univ/statusbr.h
@@ -6,16 +6,12 @@
 // Created:     14.10.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_STATUSBR_H_
 #define _WX_UNIV_STATUSBR_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "univstatusbr.h"
-#endif
-
 #include "wx/univ/inpcons.h"
 #include "wx/arrstr.h"
 
@@ -30,7 +26,7 @@ public:
     wxStatusBarUniv() { Init(); }
 
     wxStatusBarUniv(wxWindow *parent,
-                    wxWindowID id = -1,
+                    wxWindowID id = wxID_ANY,
                     long style = 0,
                     const wxString& name = wxPanelNameStr)
     {
@@ -40,7 +36,7 @@ public:
     }
 
     bool Create(wxWindow *parent,
-                wxWindowID id = -1,
+                wxWindowID id = wxID_ANY,
                 long style = 0,
                 const wxString& name = wxPanelNameStr);
 
@@ -62,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);
@@ -69,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;