Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/dfb/chkconf.h b/include/wx/dfb/chkconf.h
index cbc9e7f331e3c03e7ef8e72386e3feb56927b6f1..705890fc7b8987cd4678173dd5de591c674a45b0 100644 (file)
--- a/include/wx/dfb/chkconf.h
+++ b/include/wx/dfb/chkconf.h
@@ -21,12 +21,21 @@
 #   error "wxFileConfig is required by wxDFB port"
 #endif
 
-#if wxUSE_SOCKETS && !wxUSE_SELECT_DISPATCHER
+#if wxUSE_SOCKETS && !wxUSE_CONSOLE_EVENTLOOP
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxSocket requires wxSelectDispatcher in wxDFB"
 #   else
-#       undef wxUSE_SELECT_DISPATCHER
-#       define wxUSE_SELECT_DISPATCHER 1
+#       undef wxUSE_CONSOLE_EVENTLOOP
+#       define wxUSE_CONSOLE_EVENTLOOP 1
+#   endif
+#endif
+
+#if wxUSE_DATAOBJ
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxDataObject not supported in wxDFB"
+#   else
+#       undef wxUSE_DATAOBJ
+#       define wxUSE_DATAOBJ 0
 #   endif
 #endif