Include order is wxprec.h=>defs.h=>platform.h=>setup.h so remove explicit setup.h...

[wxWidgets.git] / include / wx / msw / tbarmsw.h

diff --git a/include/wx/msw/tbarmsw.h b/include/wx/msw/tbarmsw.h
index 2a5c36ee7d6d169218da270daf0064bee455b9bc..ab99738f937cb488d32ff6c703165d677fda0965 100644 (file)
--- a/include/wx/msw/tbarmsw.h
+++ b/include/wx/msw/tbarmsw.h
@@ -12,15 +12,11 @@
 #ifndef _WX_TBARMSW_H_
 #define _WX_TBARMSW_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "tbarmsw.h"
-#endif
-
 #if wxUSE_TOOLBAR
 
 #include "wx/tbarbase.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxButtonBarNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxButtonBarNameStr[];
 
 class WXDLLEXPORT wxMemoryDC;
 
@@ -61,7 +57,7 @@ public:
                                        const wxBitmap& pushedBitmap,
                                        bool toggle,
                                        wxCoord xPos,
-                                       wxCoord yPos = -1,
+                                       wxCoord yPos = wxDefaultCoord,
                                        wxObject *clientData = NULL,
                                        const wxString& helpString1 = wxEmptyString,
                                        const wxString& helpString2 = wxEmptyString);