Skip to content

Commit

Permalink
Disable wxDataObject in wxDFB build at configure level.
Browse files Browse the repository at this point in the history
Otherwise we'd just get an error when compiling wx/dfb/chkconf.h later.

Closes wxWidgets#15594.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75049 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
  • Loading branch information
vadz committed Oct 19, 2013
1 parent 065754a commit f91544e
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
8 changes: 7 additions & 1 deletion configure
Original file line number Diff line number Diff line change
Expand Up @@ -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;}
Expand Down
7 changes: 6 additions & 1 deletion configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit f91544e

Please sign in to comment.