support retina display

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

diff --git a/include/wx/statusbr.h b/include/wx/statusbr.h
index aaaba6607c1cde3ad72eca7ea85a337c83bc8467..52e134f19edb8174cc9b73215579550b84491bc3 100644 (file)
--- a/include/wx/statusbr.h
+++ b/include/wx/statusbr.h
@@ -16,7 +16,7 @@
 
 #if wxUSE_STATUSBAR
 
 
 #if wxUSE_STATUSBAR
 

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

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


@@ -45,6 +45,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxStatusBarNameStr[];
 #define wxSB_NORMAL    0x0000
 #define wxSB_FLAT      0x0001
 #define wxSB_RAISED    0x0002
 #define wxSB_NORMAL    0x0000
 #define wxSB_FLAT      0x0001
 #define wxSB_RAISED    0x0002

+#define wxSB_SUNKEN    0x0003

 
 // ----------------------------------------------------------------------------
 // wxStatusBarPane: an helper for wxStatusBar
 
 // ----------------------------------------------------------------------------
 // wxStatusBarPane: an helper for wxStatusBar


@@ -106,7 +107,7 @@ WX_DECLARE_EXPORTED_OBJARRAY(wxStatusBarPane, wxStatusBarPaneArray);
 // wxStatusBar: a window near the bottom of the frame used for status info
 // ----------------------------------------------------------------------------
 
 // wxStatusBar: a window near the bottom of the frame used for status info
 // ----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxStatusBarBase : public wxWindow
+class WXDLLIMPEXP_CORE wxStatusBarBase : public wxControl

 {
 public:
     wxStatusBarBase();
 {
 public:
     wxStatusBarBase();


@@ -150,10 +151,7 @@ public:
     // field styles
     // ------------
 
     // field styles
     // ------------
 

-    // Set the field style. Use either wxSB_NORMAL (default) for a standard 3D
-    // border around a field, wxSB_FLAT for no border around a field, so that it
-    // appears flat or wxSB_POPOUT to make the field appear raised.
-    // Setting field styles only works on wxMSW
+    // Set the field border style to one of wxSB_XXX values.

     virtual void SetStatusStyles(int n, const int styles[]);
 
     int GetStatusStyle(int n) const
     virtual void SetStatusStyles(int n, const int styles[]);
 
     int GetStatusStyle(int n) const


@@ -234,10 +232,7 @@ protected:
 #if defined(__WXUNIVERSAL__)
     #define wxStatusBarUniv wxStatusBar
     #include "wx/univ/statusbr.h"
 #if defined(__WXUNIVERSAL__)
     #define wxStatusBarUniv wxStatusBar
     #include "wx/univ/statusbr.h"

-#elif defined(__WXPALMOS__)
-    #define wxStatusBarPalm wxStatusBar
-    #include "wx/palmos/statusbr.h"
-#elif defined(__WIN32__) && wxUSE_NATIVE_STATUSBAR
+#elif defined(__WXMSW__) && wxUSE_NATIVE_STATUSBAR

     #include "wx/msw/statusbar.h"
 #elif defined(__WXMAC__)
     #define wxStatusBarMac wxStatusBar
     #include "wx/msw/statusbar.h"
 #elif defined(__WXMAC__)
     #define wxStatusBarMac wxStatusBar