X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/99d800190a04a2deaf769017a5fae04a4ae50378..472eec8a0391538e4dcf7f7c6c4f4d44c8383616:/include/wx/scrolbar.h?ds=sidebyside diff --git a/include/wx/scrolbar.h b/include/wx/scrolbar.h index e19f3de923..6cdf392a26 100644 --- a/include/wx/scrolbar.h +++ b/include/wx/scrolbar.h @@ -18,7 +18,7 @@ #include "wx/control.h" -extern WXDLLEXPORT_DATA(const wxChar*) wxScrollBarNameStr; +extern WXDLLEXPORT_DATA(const wxChar) wxScrollBarNameStr[]; // ---------------------------------------------------------------------------- // wxScrollBar: a scroll bar control @@ -62,8 +62,10 @@ private: #include "wx/msw/scrolbar.h" #elif defined(__WXMOTIF__) #include "wx/motif/scrolbar.h" -#elif defined(__WXGTK__) +#elif defined(__WXGTK20__) #include "wx/gtk/scrolbar.h" +#elif defined(__WXGTK__) + #include "wx/gtk1/scrolbar.h" #elif defined(__WXMAC__) #include "wx/mac/scrolbar.h" #elif defined(__WXCOCOA__)