WinCE build fix according to eVC3 and eVC4 SDKs.

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

diff --git a/include/wx/msw/tbarmsw.h b/include/wx/msw/tbarmsw.h
index d51e0ebad9f97ec91d91064b3bab9b4006267b00..288eee9e74b75f8efcf5c0d5c8da808300e3b884 100644 (file)
--- a/include/wx/msw/tbarmsw.h
+++ b/include/wx/msw/tbarmsw.h
@@ -1,31 +1,27 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/msw/tbarmsw.h
-// Purpose:     wxToolBar for Win16
+// Purpose:     wxToolBar for older Windowses
 // Author:      Julian Smart
 // Modified by: 13.12.99 by VZ during toolbar classes reorganization
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TBARMSW_H_
 #define _WX_TBARMSW_H_
 
-#ifdef __GNUG__
-#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;
 
 // ----------------------------------------------------------------------------
-// wxToolBar for Win16
+// wxToolBar for older Windowses
 // ----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxToolBar : public wxToolBarBase
@@ -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);
@@ -76,7 +72,7 @@ public:
     // implementation only from now on
     // -------------------------------
 
-    // Handle wxWindows events
+    // Handle wxWidgets events
     void OnPaint(wxPaintEvent& event);
     void OnMouseEvent(wxMouseEvent& event);