revert some stuff for 1.6

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

diff --git a/include/wx/statusbr.h b/include/wx/statusbr.h
index 8b514ca5c1eb04052d53f7be7bcc3004cd42f499..13edd15157738b15bb123b3127859d5d2d877d8c 100644 (file)
--- a/include/wx/statusbr.h
+++ b/include/wx/statusbr.h
@@ -76,8 +76,8 @@ public:
     // 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 
+    // 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
     virtual void SetStatusStyles(int n, const int styles[]);
@@ -96,7 +96,7 @@ public:
     virtual int GetBorderY() const = 0;
 
     // don't want status bars to accept the focus at all
-    virtual bool AcceptsFocus() const { return FALSE; }
+    virtual bool AcceptsFocus() const { return false; }
 
 protected:
     // set the widths array to NULL
@@ -132,7 +132,7 @@ protected:
     // width otherwise
     int       *m_statusWidths;
 
-    // the styles of the fields 
+    // the styles of the fields
     int       *m_statusStyles;
 
     // stacks of previous values for PushStatusText/PopStatusText
@@ -150,6 +150,10 @@ protected:
     #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
     #define wxStatusBar95 wxStatusBar