Implement HasSelection for the OSX WebKit backend.

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

diff --git a/include/wx/bmpcbox.h b/include/wx/bmpcbox.h
index 608fb1838fc7832d74fc689817f6095f5cfad6ee..c0b753bebd376feebf65529911012b823e024b08 100644 (file)
--- a/include/wx/bmpcbox.h
+++ b/include/wx/bmpcbox.h
@@ -19,16 +19,19 @@
 
 #include "wx/bitmap.h"
 
 
 #include "wx/bitmap.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).
 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
     #define wxBITMAPCOMBOBOX_OWNERDRAWN_BASED

+
+class WXDLLIMPEXP_FWD_CORE wxDC;

 #endif
 
 #endif
 

-extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxBitmapComboBoxNameStr[];
+extern WXDLLIMPEXP_DATA_ADV(const char) wxBitmapComboBoxNameStr[];

 
 
 class WXDLLIMPEXP_ADV wxBitmapComboBoxBase
 
 
 class WXDLLIMPEXP_ADV wxBitmapComboBoxBase


@@ -111,6 +114,8 @@ private:
     #include "wx/generic/bmpcbox.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/bmpcbox.h"
     #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
 #else
     #include "wx/generic/bmpcbox.h"
 #endif