From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 24 Sep 2006 13:18:23 +0000 (+0000)
Subject: move wxBitmapComboBox dependency check to wx/chkconf.h where it belongs
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/8d37334f0ee85da8565fd4bf0f94ca952e702db8

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
---

diff --git a/include/wx/bmpcbox.h b/include/wx/bmpcbox.h
index 1cd4ea9371..83b69a20c0 100644
--- 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_
diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 80bd127ac3..ba91775a20 100644
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -316,6 +316,14 @@
 #   endif
 #endif /* !defined(wxUSE_ACCEL) */
 
+#ifndef wxUSE_BITMAPCOMBOBOX
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_BITMAPCOMBOBOX must be defined."
+#   else
+#       define wxUSE_BITMAPCOMBOBOX 0
+#   endif
+#endif /* !defined(wxUSE_BITMAPCOMBOBOX) */
+
 #ifndef wxUSE_BMPBUTTON
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_BMPBUTTON must be defined."
@@ -1202,6 +1210,15 @@
 #   endif
 #endif /* wxUSE_CHOICEBOOK */
 
+#if !wxUSE_ODCOMBOBOX
+#   if wxUSE_BITMAPCOMBOBOX
+#       error "wxBitmapComboBox requires wxOwnerDrawnComboBox"
+#   else
+#       undef wxUSE_BITMAPCOMBOBOX
+#       define wxUSE_BITMAPCOMBOBOX 0
+#   endif
+#endif /* !wxUSE_ODCOMBOBOX */
+
 /* don't attempt to use native status bar on the platforms not having it */
 #ifndef wxUSE_NATIVE_STATUSBAR
 #   define wxUSE_NATIVE_STATUSBAR 0
diff --git a/include/wx/generic/bmpcbox.h b/include/wx/generic/bmpcbox.h
index 263cfbe02c..00706a0c9c 100644
--- a/include/wx/generic/bmpcbox.h
+++ b/include/wx/generic/bmpcbox.h
@@ -15,13 +15,8 @@
 
 #define wxGENERIC_BITMAPCOMBOBOX     1
 
-#if !wxUSE_ODCOMBOBOX
-    #error "Generic wxBitmapComboBox depends on wxOwnerDrawnComboBox"
-#endif
-
 #include "wx/odcombo.h"
 
-
 // ----------------------------------------------------------------------------
 // wxBitmapComboBox: a wxComboBox that allows images to be shown
 // in front of string items.
@@ -172,6 +167,4 @@ private:
     DECLARE_DYNAMIC_CLASS(wxBitmapComboBox)
 };
 
-
-#endif
-    // _WX_GENERIC_BMPCBOX_H_
+#endif // _WX_GENERIC_BMPCBOX_H_