allow using CPPUNIT_ASSERT_EQUAL(int, wxFileOffset) too

[wxWidgets.git] / include / wx / bmpcbox.h

diff --git a/include/wx/bmpcbox.h b/include/wx/bmpcbox.h
index 9e8bb9026a46c33d6d43b33c81fca73c87d1591b..f73f82e047818a62de72e1460cc915b89a04a7cc 100644 (file)
--- a/include/wx/bmpcbox.h
+++ b/include/wx/bmpcbox.h
@@ -25,11 +25,11 @@ class WXDLLIMPEXP_FWD_CORE wxItemContainer;
 // Define wxBITMAPCOMBOBOX_OWNERDRAWN_BASED for platforms which
 // wxBitmapComboBox implementation utilizes ownerdrawn combobox
 // (either native or generic).
-#if !defined(__WXGTK__)
+#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
@@ -112,7 +112,7 @@ private:
     #include "wx/generic/bmpcbox.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/bmpcbox.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
     #include "wx/gtk/bmpcbox.h"
 #else
     #include "wx/generic/bmpcbox.h"