Notebook, Listbox, and Checklst updates

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

diff --git a/include/wx/generic/statusbr.h b/include/wx/generic/statusbr.h
index 7a3b8a4820f14b125c0e87bbe53e7cf8196b6db9..9145f7dbafecf1d91fbfd5020b93e8dff647e8ac 100644 (file)
--- a/include/wx/generic/statusbr.h
+++ b/include/wx/generic/statusbr.h
@@ -12,7 +12,7 @@
 #ifndef _WX_GENERIC_STATUSBR_H_
 #define _WX_GENERIC_STATUSBR_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "statusbr.h"
 #endif
 
@@ -55,7 +55,7 @@ public:
   }
 
   bool Create(wxWindow *parent, wxWindowID id,
-              long style = 0,
+              long style,
               const wxString& name = wxPanelNameStr);
 
   // Create status line
@@ -96,7 +96,7 @@ public:
   void OnSysColourChanged(wxSysColourChangedEvent& event);
 
 protected:
-  wxString *        m_statusStrings;
+  wxArrayString     m_statusStrings;
   int               m_borderX;
   int               m_borderY;
   wxFont            m_defaultStatusBarFont;
@@ -110,3 +110,5 @@ private:
 
 #endif
     // _WX_GENERIC_STATUSBR_H_
+
+// vi:sts=4:sw=4:et