MSW fixes; added wxUSE_XPM to wxUniv's setup.h so now widgets sample works

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

diff --git a/include/wx/statusbr.h b/include/wx/statusbr.h
index ac33321b0cd5125d3ac0d518f1790ab863eb4c3e..56e909673706a0c15235a5868a6095480a3b568e 100644 (file)
--- a/include/wx/statusbr.h
+++ b/include/wx/statusbr.h
@@ -14,6 +14,8 @@
 
 #include "wx/window.h"
 
+#if wxUSE_STATUSBAR
+
 // ----------------------------------------------------------------------------
 // wxStatusBar: a window near the bottom of the frame used for status info
 // ----------------------------------------------------------------------------
@@ -45,6 +47,9 @@ public:
     virtual int GetBorderX() const = 0;
     virtual int GetBorderY() const = 0;
 
+    // don't want status bars to accept the focus at all
+    virtual bool AcceptsFocus() const { return FALSE; }
+
 protected:
     int     m_nFields;      // the current number of fields
     int    *m_statusWidths; // the width (if !NULL) of the fields
@@ -54,7 +59,8 @@ protected:
     #include "wx/msw/statbr95.h"
 
     typedef wxStatusBar95 wxStatusBarReal;
-#elif defined(__WXMAC__) && !defined(__UNIX__)
+#elif defined(__WXMAC__)
+    #include "wx/generic/statusbr.h"
     #include "wx/mac/statusbr.h"
 
     typedef wxStatusBarMac wxStatusBarReal;
@@ -92,5 +98,7 @@ private:
     DECLARE_DYNAMIC_CLASS(wxStatusBar)
 };
 
+#endif
+
 #endif
     // _WX_STATUSBR_H_BASE_