Compilation fix.

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

diff --git a/include/wx/statusbr.h b/include/wx/statusbr.h
index 8fb907d6253dff46338ed2c50e1d583afdf4a80a..d1f666a055cf2bd0bd76180f373864c2276d5eca 100644 (file)
--- a/include/wx/statusbr.h
+++ b/include/wx/statusbr.h
@@ -12,13 +12,16 @@
 #ifndef _WX_STATUSBR_H_BASE_
 #define _WX_STATUSBR_H_BASE_
 
 #ifndef _WX_STATUSBR_H_BASE_
 #define _WX_STATUSBR_H_BASE_
 

-#include "wx/window.h"
+#include "wx/defs.h"

 
 #if wxUSE_STATUSBAR
 
 
 #if wxUSE_STATUSBAR
 

+#include "wx/window.h"

 #include "wx/list.h"
 #include "wx/dynarray.h"
 
 #include "wx/list.h"
 #include "wx/dynarray.h"
 

+extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxStatusBarNameStr[];
+

 WX_DECLARE_LIST(wxString, wxListString);
 
 // ----------------------------------------------------------------------------
 WX_DECLARE_LIST(wxString, wxListString);
 
 // ----------------------------------------------------------------------------


@@ -94,7 +97,11 @@ public:
     // don't want status bars to accept the focus at all
     virtual bool AcceptsFocus() const { return false; }
 
     // don't want status bars to accept the focus at all
     virtual bool AcceptsFocus() const { return false; }
 

+    virtual bool CanBeOutsideClientArea() const { return true; }
+

 protected:
 protected:

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

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


@@ -151,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