From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 28 Jan 2010 12:07:16 +0000 (+0000)
Subject: Disable wxUSE_OWNER_DRAWN for wxUniv to fix the build.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/aedb388157db64d85a04f9ab13999aff73f9bed0

Disable wxUSE_OWNER_DRAWN for wxUniv to fix the build.

wxMenuItem in wxUniv doesn't even use wxOwnerDrawn but linking in
ownerdrwcmn.cpp is enough to break the DLL build of wxUniv at least under MSW
as it references symbols normally defined in msw/ownerdrw.cpp which is not
part of wxUniv.

Fix this by simply disabling wxUSE_OWNER_DRAWN under wxUniv for now as it's
unused anyhow.

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

diff --git a/include/wx/univ/chkconf.h b/include/wx/univ/chkconf.h
index 2aeea1f6d5..8bb91b8905 100644
--- a/include/wx/univ/chkconf.h
+++ b/include/wx/univ/chkconf.h
@@ -11,6 +11,17 @@
 #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"