X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3a5bcc4db0851bf8cd3063917511b0b17c7f9679..3b2b40b45fd13c5fead54b7d36819b1411fdef63:/include/wx/msw/tbarmsw.h diff --git a/include/wx/msw/tbarmsw.h b/include/wx/msw/tbarmsw.h index 388b501c08..ab99738f93 100644 --- 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); @@ -76,7 +72,7 @@ public: // implementation only from now on // ------------------------------- - // Handle wxWindows events + // Handle wxWidgets events void OnPaint(wxPaintEvent& event); void OnMouseEvent(wxMouseEvent& event);