Fixed some duff #ifdefs

[wxWidgets.git] / include / wx / mac / frame.h

diff --git a/include/wx/mac/frame.h b/include/wx/mac/frame.h
index 44038e6ddd101be1f74f18949dde90b9c7b3018e..aa21b150ee4d02033328d05ade38286b83653e60 100644 (file)
--- a/include/wx/mac/frame.h
+++ b/include/wx/mac/frame.h
@@ -72,7 +72,7 @@ public:
 
     // Toolbar
 #if wxUSE_TOOLBAR
-    virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER | wxTB_HORIZONTAL | wxTB_FLAT,
+    virtual wxToolBar* CreateToolBar(long style = -1,
                                      wxWindowID id = -1,
                                      const wxString& name = wxToolBarNameStr);
 
@@ -87,11 +87,6 @@ public:
                                            const wxString& name = wxStatusLineNameStr);
 
     virtual void PositionStatusBar();
-
-  // Hint to tell framework which status bar to use
-  // TODO: should this go into a wxFrameworkSettings class perhaps?
-  static void UseNativeStatusBar(bool useNative) { m_useNativeStatusBar = useNative; };
-  static bool UsesNativeStatusBar() { return m_useNativeStatusBar; };
 #endif // wxUSE_STATUSBAR
 
     // tooltip management
@@ -117,9 +112,6 @@ protected:
     virtual void AttachMenuBar(wxMenuBar *menubar);
 
 protected:
-#if wxUSE_STATUSBAR
-    static bool           m_useNativeStatusBar;
-#endif // wxUSE_STATUSBAR
     // the last focused child: we restore focus to it on activation
     wxWindow             *m_winLastFocused;