X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c574bfa9022576fd0444be7155b0e22e6f6b8d85..c6212a0cb7e6285f62198a9411d91bbe8dc06e60:/include/wx/bmpcbox.h?ds=sidebyside diff --git a/include/wx/bmpcbox.h b/include/wx/bmpcbox.h index 608fb1838f..f73f82e047 100644 --- a/include/wx/bmpcbox.h +++ b/include/wx/bmpcbox.h @@ -18,17 +18,18 @@ #if wxUSE_BITMAPCOMBOBOX #include "wx/bitmap.h" +#include "wx/window.h" class WXDLLIMPEXP_FWD_CORE wxItemContainer; // Define wxBITMAPCOMBOBOX_OWNERDRAWN_BASED for platforms which // wxBitmapComboBox implementation utilizes ownerdrawn combobox // (either native or generic). -#if 1 +#if !defined(__WXGTK20__) || defined(__WXUNIVERSAL__) #define wxBITMAPCOMBOBOX_OWNERDRAWN_BASED #endif -extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxBitmapComboBoxNameStr[]; +extern WXDLLIMPEXP_DATA_ADV(const char) wxBitmapComboBoxNameStr[]; class WXDLLIMPEXP_ADV wxBitmapComboBoxBase @@ -111,6 +112,8 @@ private: #include "wx/generic/bmpcbox.h" #elif defined(__WXMSW__) #include "wx/msw/bmpcbox.h" +#elif defined(__WXGTK20__) + #include "wx/gtk/bmpcbox.h" #else #include "wx/generic/bmpcbox.h" #endif