X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d775fa82354a1f8d5db87ad1d71ab00ef7d9123c..3b8b8024a01220cc4c72b69ac16c6e606f260b74:/include/wx/statusbr.h

diff --git a/include/wx/statusbr.h b/include/wx/statusbr.h
index d91defc1b3..f75d053720 100644
--- a/include/wx/statusbr.h
+++ b/include/wx/statusbr.h
@@ -5,24 +5,23 @@
 // Modified by:
 // Created:     05.02.00
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWidgets team
+// Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATUSBR_H_BASE_
 #define _WX_STATUSBR_H_BASE_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "statbar.h"
-#endif
-
-#include "wx/window.h"
+#include "wx/defs.h"
 
 #if wxUSE_STATUSBAR
 
+#include "wx/window.h"
 #include "wx/list.h"
 #include "wx/dynarray.h"
 
+extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxStatusBarNameStr[];
+
 WX_DECLARE_LIST(wxString, wxListString);
 
 // ----------------------------------------------------------------------------
@@ -38,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();
@@ -98,7 +97,11 @@ public:
     // don't want status bars to accept the focus at all
     virtual bool AcceptsFocus() const { return false; }
 
+    virtual bool CanBeOutsideClientArea() const { return true; }
+
 protected:
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+
     // set the widths array to NULL
     void InitWidths();
 
@@ -150,10 +153,12 @@ protected:
     #define wxStatusBarUniv wxStatusBar
 
     #include "wx/univ/statusbr.h"
-#elif defined(__WIN32__) && wxUSE_NATIVE_STATUSBAR
-    #define wxStatusBar95 wxStatusBar
+#elif defined(__WXPALMOS__)
+    #define wxStatusBarPalm wxStatusBar
 
-    #include "wx/msw/statbr95.h"
+    #include "wx/palmos/statusbr.h"
+#elif defined(__WIN32__) && wxUSE_NATIVE_STATUSBAR
+    #include "wx/msw/statusbar.h"
 #elif defined(__WXMAC__)
     #define wxStatusBarMac wxStatusBar