X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..b7e5ba8f2d676583c790c59388eba8bfa9bd33c2:/include/wx/listbox.h?ds=sidebyside diff --git a/include/wx/listbox.h b/include/wx/listbox.h index 18d6e58431..0556f805cf 100644 --- a/include/wx/listbox.h +++ b/include/wx/listbox.h @@ -30,7 +30,7 @@ class WXDLLIMPEXP_BASE wxArrayString; // global data // ---------------------------------------------------------------------------- -extern WXDLLEXPORT_DATA(const wxChar*) wxListBoxNameStr; +extern WXDLLEXPORT_DATA(const wxChar) wxListBoxNameStr[]; // ---------------------------------------------------------------------------- // wxListBox interface is defined by the class wxListBoxBase @@ -135,8 +135,10 @@ protected: #include "wx/msw/listbox.h" #elif defined(__WXMOTIF__) #include "wx/motif/listbox.h" -#elif defined(__WXGTK__) +#elif defined(__WXGTK20__) #include "wx/gtk/listbox.h" +#elif defined(__WXGTK__) + #include "wx/gtk1/listbox.h" #elif defined(__WXMAC__) #include "wx/mac/listbox.h" #elif defined(__WXPM__)