check for self-assignment in operator=

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

diff --git a/include/wx/bmpcbox.h b/include/wx/bmpcbox.h
index 841841970169d5c21ce9bd5595f0d7f58d1cd60c..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).
 // Define wxBITMAPCOMBOBOX_OWNERDRAWN_BASED for platforms which
 // wxBitmapComboBox implementation utilizes ownerdrawn combobox
 // (either native or generic).

-#if !defined(__WXGTK20__)
+#if !defined(__WXGTK20__) || defined(__WXUNIVERSAL__)

     #define wxBITMAPCOMBOBOX_OWNERDRAWN_BASED
 #endif
 
     #define wxBITMAPCOMBOBOX_OWNERDRAWN_BASED
 #endif
 

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

 
 
 class WXDLLIMPEXP_ADV wxBitmapComboBoxBase
 
 
 class WXDLLIMPEXP_ADV wxBitmapComboBoxBase