make popup on mac behave as on msw

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

diff --git a/include/wx/statusbr.h b/include/wx/statusbr.h
index d60562e139ed873f90d0d92df844472562b47ec6..d1f666a055cf2bd0bd76180f373864c2276d5eca 100644 (file)
--- a/include/wx/statusbr.h
+++ b/include/wx/statusbr.h
@@ -5,24 +5,23 @@
 // Modified by:
 // Created:     05.02.00
 // RCS-ID:      $Id$
 // 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_
 
 // 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
 
 
 #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);
 
 // ----------------------------------------------------------------------------


@@ -98,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();
 


@@ -150,14 +153,12 @@ protected:
     #define wxStatusBarUniv wxStatusBar
 
     #include "wx/univ/statusbr.h"
     #define wxStatusBarUniv wxStatusBar
 
     #include "wx/univ/statusbr.h"

-#elif defined(__PALMOS__)
+#elif defined(__WXPALMOS__)

     #define wxStatusBarPalm wxStatusBar
 
     #include "wx/palmos/statusbr.h"
 #elif defined(__WIN32__) && wxUSE_NATIVE_STATUSBAR
     #define wxStatusBarPalm wxStatusBar
 
     #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