avoid conflict between wxBookCtrlBase::DoSetSelection() and the derived classes;...

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

diff --git a/include/wx/bmpcbox.h b/include/wx/bmpcbox.h
index 1cd4ea9371b8cf80d899ee40e72fee2be91135a3..83b69a20c0fb8366d7002e1a81b7967a6b2fd6fb 100644 (file)
--- a/include/wx/bmpcbox.h
+++ b/include/wx/bmpcbox.h
@@ -26,7 +26,6 @@ extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxBitmapComboBoxNameStr[];
 class WXDLLIMPEXP_ADV wxBitmapComboBoxBase
 {
 public:
-
     // ctors and such
     wxBitmapComboBoxBase() { }
 
@@ -40,20 +39,11 @@ public:
 
     // Returns size of the image used in list
     virtual wxSize GetBitmapSize() const = 0;
-
-protected:
-
-private:
 };
 
 
-#if defined(__WXUNIVERSAL__)
-    #include "wx/generic/bmpcbox.h"
-#else
-    #include "wx/generic/bmpcbox.h"
-#endif
+#include "wx/generic/bmpcbox.h"
 
 #endif // wxUSE_BITMAPCOMBOBOX
 
-#endif
-    // _WX_BMPCBOX_H_BASE_
+#endif // _WX_BMPCBOX_H_BASE_