first pass of wxUniv merge - nothing works, most parts don't even compile

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

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
@@ -93,5 +98,7 @@ private:
     DECLARE_DYNAMIC_CLASS(wxStatusBar)
 };
 
+#endif
+
 #endif
     // _WX_STATUSBR_H_BASE_