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

remove blatant hack from configure and do proper checking for stuff wxCocoa does not support

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29704 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ryan Norton
2004-10-07 17:22:56 +00:00
parent bf47e3986a
commit 207bc66c38
2 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
configure vendored
View File

@@ -7008,13 +7008,6 @@ elif test "$wxUSE_CONTROLS" = "no"; then
DEFAULT_wxUSE_TIPWINDOW=no DEFAULT_wxUSE_TIPWINDOW=no
fi fi
## FIXME: This is a blatant hack
if test "x$wxUSE_COCOA" != "x" -a "$wxUSE_COCOA" != "0" ; then
wxUSE_PRINTING_ARCHITECTURE=no
wxUSE_DRAG_AND_DROP=no
DEFAULT_wxUSE_DRAGIMAGE=no
fi
enablestring= enablestring=
echo "$as_me:$LINENO: checking for --${enablestring:-enable}-accel" >&5 echo "$as_me:$LINENO: checking for --${enablestring:-enable}-accel" >&5
@@ -22551,6 +22544,24 @@ if test "$wxUSE_GUI" = "yes"; then
WXGTK20= WXGTK20=
WXGPE= WXGPE=
if test "$wxUSE_COCOA" = 1 ; then
if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes"; then
{ echo "$as_me:$LINENO: WARNING: Printing not supported under wxCocoa yet, disabled" >&5
echo "$as_me: WARNING: Printing not supported under wxCocoa yet, disabled" >&2;}
wxUSE_PRINTING_ARCHITECTURE=no
fi
if test "$wxUSE_DRAG_AND_DROP" = "yes"; then
{ echo "$as_me:$LINENO: WARNING: Drag and Drop not supported under wxCocoa yet, disabled" >&5
echo "$as_me: WARNING: Drag and Drop not supported under wxCocoa yet, disabled" >&2;}
wxUSE_DRAG_AND_DROP=no
fi
if test "$wxUSE_DRAGIMAGE" = "yes"; then
{ echo "$as_me:$LINENO: WARNING: Drag Image and DandD not supported under wxCocoa yet, disabled" >&5
echo "$as_me: WARNING: Drag Image and DandD not supported under wxCocoa yet, disabled" >&2;}
wxUSE_DRAGIMAGE=no
fi
fi
if test "$wxUSE_MSW" = 1 ; then if test "$wxUSE_MSW" = 1 ; then
TOOLKIT=MSW TOOLKIT=MSW
GUIDIST=MSW_DIST GUIDIST=MSW_DIST

22
configure.in
View File

@@ -1044,13 +1044,6 @@ elif test "$wxUSE_CONTROLS" = "no"; then
DEFAULT_wxUSE_TIPWINDOW=no DEFAULT_wxUSE_TIPWINDOW=no
fi fi
## FIXME: This is a blatant hack
if test "x$wxUSE_COCOA" != "x" -a "$wxUSE_COCOA" != "0" ; then
wxUSE_PRINTING_ARCHITECTURE=no
wxUSE_DRAG_AND_DROP=no
DEFAULT_wxUSE_DRAGIMAGE=no
fi
WX_ARG_ENABLE(accel, [ --enable-accel use accelerators], wxUSE_ACCEL) WX_ARG_ENABLE(accel, [ --enable-accel use accelerators], wxUSE_ACCEL)
WX_ARG_ENABLE(button, [ --enable-button use wxButton class], wxUSE_BUTTON) WX_ARG_ENABLE(button, [ --enable-button use wxButton class], wxUSE_BUTTON)
WX_ARG_ENABLE(bmpbutton, [ --enable-bmpbutton use wxBitmapButton class], wxUSE_BMPBUTTON) WX_ARG_ENABLE(bmpbutton, [ --enable-bmpbutton use wxBitmapButton class], wxUSE_BMPBUTTON)
@@ -2429,6 +2422,21 @@ if test "$wxUSE_GUI" = "yes"; then
WXGTK20= WXGTK20=
WXGPE= WXGPE=
if test "$wxUSE_COCOA" = 1 ; then
if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes"; then
AC_MSG_WARN([Printing not supported under wxCocoa yet, disabled])
wxUSE_PRINTING_ARCHITECTURE=no
fi
if test "$wxUSE_DRAG_AND_DROP" = "yes"; then
AC_MSG_WARN([Drag and Drop not supported under wxCocoa yet, disabled])
wxUSE_DRAG_AND_DROP=no
fi
if test "$wxUSE_DRAGIMAGE" = "yes"; then
AC_MSG_WARN([Drag Image and DandD not supported under wxCocoa yet, disabled])
wxUSE_DRAGIMAGE=no
fi
fi
if test "$wxUSE_MSW" = 1 ; then if test "$wxUSE_MSW" = 1 ; then
TOOLKIT=MSW TOOLKIT=MSW
GUIDIST=MSW_DIST GUIDIST=MSW_DIST