porting reordering of controls back from 2.8

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

diff --git a/include/wx/statusbr.h b/include/wx/statusbr.h
index 8d7594ac78473e282ba1d018f963aecbb339ce63..d1f666a055cf2bd0bd76180f373864c2276d5eca 100644 (file)
--- a/include/wx/statusbr.h
+++ b/include/wx/statusbr.h
@@ -100,6 +100,8 @@ public:
     virtual bool CanBeOutsideClientArea() const { return true; }
 
 protected:
     virtual bool CanBeOutsideClientArea() const { return true; }
 
 protected:

+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+

     // set the widths array to NULL
     void InitWidths();
 
     // set the widths array to NULL
     void InitWidths();
 


@@ -156,9 +158,7 @@ protected:
 
     #include "wx/palmos/statusbr.h"
 #elif defined(__WIN32__) && wxUSE_NATIVE_STATUSBAR
 
     #include "wx/palmos/statusbr.h"
 #elif defined(__WIN32__) && wxUSE_NATIVE_STATUSBAR

-    #define wxStatusBar95 wxStatusBar
-
-    #include "wx/msw/statbr95.h"
+    #include "wx/msw/statusbar.h"

 #elif defined(__WXMAC__)
     #define wxStatusBarMac wxStatusBar
 
 #elif defined(__WXMAC__)
     #define wxStatusBarMac wxStatusBar