move wxBitmapComboBox dependency check to wx/chkconf.h where it belongs

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41417 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

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_