Make wxComboCtrlBase::Set*groundColour() methods public.

[wxWidgets.git] / include / wx / univ / chkconf.h

diff --git a/include/wx/univ/chkconf.h b/include/wx/univ/chkconf.h
index 2aeea1f6d571dcf11eb0e953e5e2a9c4869ffb28..45667dc31e9d65cc059bf36acd6f2ae67076a1d8 100644 (file)
--- a/include/wx/univ/chkconf.h
+++ b/include/wx/univ/chkconf.h
@@ -3,7 +3,6 @@
 // Purpose:     wxUniversal-specific configuration options checks
 // Author:      Vadim Zeitlin
 // Created:     2006-09-28 (extracted from wx/chkconf.h)
 // Purpose:     wxUniversal-specific configuration options checks
 // Author:      Vadim Zeitlin
 // Created:     2006-09-28 (extracted from wx/chkconf.h)

-// RCS-ID:      $Id$

 // Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -11,6 +10,17 @@
 #ifndef _WX_UNIV_CHKCONF_H_
 #define _WX_UNIV_CHKCONF_H_
 
 #ifndef _WX_UNIV_CHKCONF_H_
 #define _WX_UNIV_CHKCONF_H_
 

+#if wxUSE_OWNER_DRAWN
+    /*
+        It is not clear if owner-drawn code makes much sense for wxUniv in the
+        first place but in any case it doesn't link currently (at least under
+        wxMSW but probably elsewhere too) as there is no wxUniv-specific
+        wxOwnerDrawnBase implementation so disable it for now.
+    */
+    #undef wxUSE_OWNER_DRAWN
+    #define wxUSE_OWNER_DRAWN 0
+#endif /* wxUSE_OWNER_DRAWN */
+

 #if (wxUSE_COMBOBOX || wxUSE_MENUS) && !wxUSE_POPUPWIN
 #    ifdef wxABORT_ON_CONFIG_ERROR
 #        error "wxUSE_POPUPWIN must be defined to use comboboxes/menus"
 #if (wxUSE_COMBOBOX || wxUSE_MENUS) && !wxUSE_POPUPWIN
 #    ifdef wxABORT_ON_CONFIG_ERROR
 #        error "wxUSE_POPUPWIN must be defined to use comboboxes/menus"