added wx/object.h include (bug 1398517)

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

diff --git a/include/wx/msw/tbarmsw.h b/include/wx/msw/tbarmsw.h
index 66b3ea2c9eec1e46c302508acadd53f23a6b1a40..288eee9e74b75f8efcf5c0d5c8da808300e3b884 100644 (file)
--- a/include/wx/msw/tbarmsw.h
+++ b/include/wx/msw/tbarmsw.h
@@ -6,21 +6,17 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #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);