X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3b8b8024a01220cc4c72b69ac16c6e606f260b74..a7689c49fe02c0c065facf736ab28b19f5997b7c:/include/wx/bmpcbox.h?ds=sidebyside diff --git a/include/wx/bmpcbox.h b/include/wx/bmpcbox.h index 79010ec0a2..c0b753bebd 100644 --- a/include/wx/bmpcbox.h +++ b/include/wx/bmpcbox.h @@ -18,18 +18,20 @@ #if wxUSE_BITMAPCOMBOBOX #include "wx/bitmap.h" -#include "wx/window.h" +class WXDLLIMPEXP_FWD_CORE wxWindow; 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 + +class WXDLLIMPEXP_FWD_CORE wxDC; #endif -extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxBitmapComboBoxNameStr[]; +extern WXDLLIMPEXP_DATA_ADV(const char) wxBitmapComboBoxNameStr[]; class WXDLLIMPEXP_ADV wxBitmapComboBoxBase @@ -112,6 +114,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