Added experimental async clipboard format query

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

diff --git a/include/wx/statusbr.h b/include/wx/statusbr.h
index 8d7594ac78473e282ba1d018f963aecbb339ce63..70f24e2734627223e3633dbc6d1e56594e675d72 100644 (file)
--- a/include/wx/statusbr.h
+++ b/include/wx/statusbr.h
@@ -20,7 +20,7 @@
 #include "wx/list.h"
 #include "wx/dynarray.h"
 
-extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxStatusBarNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxStatusBarNameStr[];
 
 WX_DECLARE_LIST(wxString, wxListString);
 
@@ -37,7 +37,7 @@ WX_DECLARE_LIST(wxString, wxListString);
 // wxStatusBar: a window near the bottom of the frame used for status info
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxStatusBarBase : public wxWindow
+class WXDLLIMPEXP_CORE wxStatusBarBase : public wxWindow
 {
 public:
     wxStatusBarBase();
@@ -100,6 +100,8 @@ public:
     virtual bool CanBeOutsideClientArea() const { return true; }
 
 protected:
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+
     // set the widths array to NULL
     void InitWidths();
 
@@ -156,14 +158,12 @@ protected:
 
     #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
 
     #include "wx/generic/statusbr.h"
-    #include "wx/mac/statusbr.h"
+    #include "wx/osx/statusbr.h"
 #else
     #define wxStatusBarGeneric wxStatusBar