Fixed bug #1022383: 'several ComboBoxes appear selected'

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

diff --git a/include/wx/msw/tbarmsw.h b/include/wx/msw/tbarmsw.h
index 388b501c0825c6a08ac964142e0a0a876261e969..00015a908ab6ce26bac4e08ce357f224af41221f 100644 (file)
--- a/include/wx/msw/tbarmsw.h
+++ b/include/wx/msw/tbarmsw.h
@@ -20,7 +20,7 @@
 
 #include "wx/tbarbase.h"
 
 
 #include "wx/tbarbase.h"
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxButtonBarNameStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxButtonBarNameStr;

 
 class WXDLLEXPORT wxMemoryDC;
 
 
 class WXDLLEXPORT wxMemoryDC;
 


@@ -61,7 +61,7 @@ public:
                                        const wxBitmap& pushedBitmap,
                                        bool toggle,
                                        wxCoord xPos,
                                        const wxBitmap& pushedBitmap,
                                        bool toggle,
                                        wxCoord xPos,

-                                       wxCoord yPos = -1,
+                                       wxCoord yPos = wxDefaultCoord,

                                        wxObject *clientData = NULL,
                                        const wxString& helpString1 = wxEmptyString,
                                        const wxString& helpString2 = wxEmptyString);
                                        wxObject *clientData = NULL,
                                        const wxString& helpString1 = wxEmptyString,
                                        const wxString& helpString2 = wxEmptyString);


@@ -76,7 +76,7 @@ public:
     // implementation only from now on
     // -------------------------------
 
     // implementation only from now on
     // -------------------------------
 

-    // Handle wxWindows events
+    // Handle wxWidgets events

     void OnPaint(wxPaintEvent& event);
     void OnMouseEvent(wxMouseEvent& event);
 
     void OnPaint(wxPaintEvent& event);
     void OnMouseEvent(wxMouseEvent& event);