Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable wxDataObject in wxDFB build at configure level.

Browse Source 
Otherwise we'd just get an error when compiling wx/dfb/chkconf.h later.

Closes #15594.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75049 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-10-19 12:05:47 +00:00
parent 065754a50f
commit f91544e613
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
configure vendored
View File

@@ -35824,8 +35824,14 @@ $as_echo "$as_me: WARNING: wxWidgets IPC classes require sockets... disabled" >&
fi
if test "$wxUSE_DATAOBJ" = "yes"; then
$as_echo "#define wxUSE_DATAOBJ 1" >>confdefs.h
if test "$wxUSE_DFB" = 1; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxDataObject not yet supported under $TOOLKIT... disabled" >&5
$as_echo "$as_me: WARNING: wxDataObject not yet supported under $TOOLKIT... disabled" >&2;}
wxUSE_DATAOBJ=no
else
$as_echo "#define wxUSE_DATAOBJ 1" >>confdefs.h
fi
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Clipboard and drag-and-drop require wxDataObject -- disabled" >&5
$as_echo "$as_me: WARNING: Clipboard and drag-and-drop require wxDataObject -- disabled" >&2;}

7
configure.in
View File

@@ -6544,7 +6544,12 @@ if test "$wxUSE_IPC" = "yes"; then
fi
if test "$wxUSE_DATAOBJ" = "yes"; then
AC_DEFINE(wxUSE_DATAOBJ)
if test "$wxUSE_DFB" = 1; then
AC_MSG_WARN([wxDataObject not yet supported under $TOOLKIT... disabled])
wxUSE_DATAOBJ=no
else
AC_DEFINE(wxUSE_DATAOBJ)
fi
else
AC_MSG_WARN([Clipboard and drag-and-drop require wxDataObject -- disabled])
wxUSE_CLIPBOARD=no