avoid a bug in Carbon headers

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

diff --git a/include/wx/statusbr.h b/include/wx/statusbr.h
index adafc8bfce155776c69178f5a830707212979998..515417d7ad59b6b9b0e1edf057d59b08cad77577 100644 (file)
--- a/include/wx/statusbr.h
+++ b/include/wx/statusbr.h
@@ -6,13 +6,13 @@
 // Created:     05.02.00
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWindows team
 // Created:     05.02.00
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWindows team

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATUSBR_H_BASE_
 #define _WX_STATUSBR_H_BASE_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATUSBR_H_BASE_
 #define _WX_STATUSBR_H_BASE_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "statbar.h"
 #endif
 
     #pragma interface "statbar.h"
 #endif
 


@@ -21,6 +21,7 @@
 #if wxUSE_STATUSBAR
 
 #include "wx/list.h"
 #if wxUSE_STATUSBAR
 
 #include "wx/list.h"

+#include "wx/dynarray.h"

 
 WX_DECLARE_LIST(wxString, wxListString);
 
 
 WX_DECLARE_LIST(wxString, wxListString);
 


@@ -111,6 +112,8 @@ protected:
     // stacks of previous values for PushStatusText/PopStatusText
     // this is created on demand, use GetStatusStack/GetOrCreateStatusStack
     wxListString **m_statusTextStacks;
     // stacks of previous values for PushStatusText/PopStatusText
     // this is created on demand, use GetStatusStack/GetOrCreateStatusStack
     wxListString **m_statusTextStacks;

+
+    DECLARE_NO_COPY_CLASS(wxStatusBarBase)

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------