X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a44fb285c5ba855d135090567eaa671df4462637..60dd3c0916772e3e64fde7c83d359daae02b40a6:/include/wx/statbmp.h?ds=sidebyside diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h index 80b4d2dcf8..73f773c9f8 100644 --- a/include/wx/statbmp.h +++ b/include/wx/statbmp.h @@ -20,7 +20,7 @@ #include "wx/bitmap.h" #include "wx/icon.h" -extern WXDLLEXPORT_DATA(const wxChar*) wxStaticBitmapNameStr; +extern WXDLLEXPORT_DATA(const wxChar) wxStaticBitmapNameStr[]; // a control showing an icon or a bitmap class WXDLLEXPORT wxStaticBitmapBase : public wxControl @@ -56,8 +56,10 @@ protected: #include "wx/msw/statbmp.h" #elif defined(__WXMOTIF__) #include "wx/motif/statbmp.h" -#elif defined(__WXGTK__) +#elif defined(__WXGTK20__) #include "wx/gtk/statbmp.h" +#elif defined(__WXGTK__) + #include "wx/gtk1/statbmp.h" #elif defined(__WXMAC__) #include "wx/mac/statbmp.h" #elif defined(__WXCOCOA__)