merge of RTL changes (with many modifications) from SOC2006_RTL branch

[wxWidgets.git] / include / wx / mac / classic / toolbar.h

diff --git a/include/wx/mac/classic/toolbar.h b/include/wx/mac/classic/toolbar.h
index 9c14c86b179a384c9e862b125a9e3f80c9c489e5..18141faa1aba3dc7f8e905fea67073bddfc32d98 100644 (file)
--- a/include/wx/mac/classic/toolbar.h
+++ b/include/wx/mac/classic/toolbar.h
@@ -6,22 +6,18 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TOOLBAR_H_
 #define _WX_TOOLBAR_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "toolbar.h"
-#endif
-
 #if wxUSE_TOOLBAR
 
 #include "wx/tbarbase.h"
 #include "wx/dynarray.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxToolBarNameStr[];
 
 class WXDLLEXPORT wxToolBar: public wxToolBarBase
 {