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

Merge in from trunk r68684 - r69046

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@69047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2011-09-10 15:09:22 +00:00
parent d4adec8361 01bd848eb9
commit 1d156af324
283 changed files with 12986 additions and 1945 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
configure.in
View File

@@ -395,6 +395,8 @@ DEFAULT_wxUSE_UNICODE_UTF8=auto
DEFAULT_wxUSE_OPENGL=auto
DEFAULT_wxUSE_MEDIACTRL=auto
DEFAULT_wxUSE_COMPILER_TLS=auto
DEFAULT_wxUSE_HOTKEY=auto
DEFAULT_wxUSE_METAFILE=auto
DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no
@@ -862,7 +864,6 @@ dnl ---------------------------------------------------------------------------
WX_ARG_FEATURE(clipboard, [ --enable-clipboard use wxClipboard class], wxUSE_CLIPBOARD)
WX_ARG_FEATURE(dnd, [ --enable-dnd use Drag'n'Drop classes], wxUSE_DRAG_AND_DROP)
WX_ARG_FEATURE(metafile, [ --enable-metafile use win32 metafiles], wxUSE_METAFILE)
dnl ---------------------------------------------------------------------------
dnl optional GUI controls (in alphabetical order except the first one)
@@ -878,6 +879,7 @@ dnl disabled
if test "$wxUSE_CONTROLS" = "no"; then
DEFAULT_wxUSE_ACCEL=no
DEFAULT_wxUSE_ANIMATIONCTRL=no
DEFAULT_wxUSE_BANNERWINDOW=no
DEFAULT_wxUSE_BMPBUTTON=no
DEFAULT_wxUSE_BUTTON=no
DEFAULT_wxUSE_CALCTRL=no
@@ -933,6 +935,7 @@ if test "$wxUSE_CONTROLS" = "no"; then
DEFAULT_wxUSE_TOOLTIPS=no
DEFAULT_wxUSE_TREEBOOK=no
DEFAULT_wxUSE_TREECTRL=no
DEFAULT_wxUSE_TREELISTCTRL=no
fi
dnl features affecting multiple controls
@@ -941,6 +944,7 @@ WX_ARG_FEATURE(markup, [ --enable-markup support wxControl::SetLab
dnl please keep the settings below in alphabetical order
WX_ARG_FEATURE(accel, [ --enable-accel use accelerators], wxUSE_ACCEL)
WX_ARG_FEATURE(animatectrl, [ --enable-animatectrl use wxAnimationCtrl class], wxUSE_ANIMATIONCTRL)
WX_ARG_FEATURE(bannerwindow,[ --enable-bannerwindow use wxBannerWindow class], wxUSE_BANNERWINDOW)
WX_ARG_FEATURE(artstd, [ --enable-artstd use standard XPM icons in wxArtProvider], wxUSE_ARTPROVIDER_STD)
WX_ARG_FEATURE(arttango, [ --enable-arttango use Tango icons in wxArtProvider], wxUSE_ARTPROVIDER_TANGO)
WX_ARG_FEATURE(bmpbutton, [ --enable-bmpbutton use wxBitmapButton class], wxUSE_BMPBUTTON)
@@ -1004,6 +1008,7 @@ WX_ARG_FEATURE(toolbar, [ --enable-toolbar use wxToolBar class], wxU
WX_ARG_FEATURE(toolbook, [ --enable-toolbook use wxToolbook class], wxUSE_TOOLBOOK)
WX_ARG_FEATURE(treebook, [ --enable-treebook use wxTreebook class], wxUSE_TREEBOOK)
WX_ARG_FEATURE(treectrl, [ --enable-treectrl use wxTreeCtrl class], wxUSE_TREECTRL)
WX_ARG_FEATURE(treelist, [ --enable-treelist use wxTreeListCtrl class], wxUSE_TREELISTCTRL)
dnl ---------------------------------------------------------------------------
dnl common dialogs
@@ -1036,8 +1041,9 @@ WX_ARG_FEATURE(splines, [ --enable-splines use spline drawing code],
WX_ARG_FEATURE(mousewheel, [ --enable-mousewheel use mousewheel], wxUSE_MOUSEWHEEL)
WX_ARG_FEATURE(validators, [ --enable-validators use wxValidator and derived classes], wxUSE_VALIDATORS)
WX_ARG_FEATURE(busyinfo, [ --enable-busyinfo use wxBusyInfo], wxUSE_BUSYINFO)
WX_ARG_FEATURE(hotkey, [ --enable-hotkey use wxWindow::RegisterHotKey()], wxUSE_HOTKEY)
WX_ARG_FEATURE(joystick, [ --enable-joystick use wxJoystick], wxUSE_JOYSTICK)
WX_ARG_FEATURE(metafile, [ --enable-metafiles use wxMetaFile (Win32 only)], wxUSE_METAFILE)
WX_ARG_FEATURE(metafile, [ --enable-metafiles use wxMetaFile], wxUSE_METAFILE)
WX_ARG_FEATURE(dragimage, [ --enable-dragimage use wxDragImage], wxUSE_DRAGIMAGE)
WX_ARG_FEATURE(accessibility,[ --enable-accessibility enable accessibility support], wxUSE_ACCESSIBILITY)
WX_ARG_FEATURE(uiactionsim, [ --enable-uiactionsim use wxUIActionSimulator (experimental)], wxUSE_UIACTIONSIMULATOR)
@@ -2896,7 +2902,6 @@ if test "$wxUSE_GUI" = "yes"; then
GUI_TK_LIBRARY=
WXGTK12=
WXGTK127=
WXGTK2=
WXGPE=
@@ -2961,9 +2966,6 @@ if test "$wxUSE_GUI" = "yes"; then
esac
AM_PATH_GTK_2_0(2.4.0, wx_cv_lib_gtk=2.0, , $GTK_MODULES)
dnl we use symbols from X11 directly so we should link with it
GTK_LIBS="$GTK_LIBS -lX11"
fi
dnl detect GTK1.x
@@ -2981,6 +2983,9 @@ if test "$wxUSE_GUI" = "yes"; then
dnl looks better in AC_MSG_RESULT
wx_cv_lib_gtk=none
else
dnl we use symbols from X11 directly so we should link with it
GTK_LIBS="$GTK_LIBS -lX11"
dnl we need to cache GTK_CFLAGS and GTK_LIBS for the
dnl subsequent runs
wx_cv_cflags_gtk=$GTK_CFLAGS
@@ -3000,10 +3005,8 @@ if test "$wxUSE_GUI" = "yes"; then
TOOLKIT_VERSION=2
;;
1.2.7) WXGTK127=1
WXGTK12=1
;;
1.2.3) WXGTK12=1
;;
1.2*) ;;
*) AC_MSG_ERROR([
The development files for GTK+ were not found. For GTK+ 2, please
ensure that pkg-config is in the path and that gtk+-2.0.pc is
@@ -3108,10 +3111,6 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
TOOLKIT_INCLUDE="$wx_cv_cflags_gtk"
GUI_TK_LIBRARY="$wx_cv_libs_gtk $GUI_TK_LIBRARY"
dnl disable GTK runtime type checks
TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -DG_DISABLE_CAST_CHECKS"
AFMINSTALL=afminstall
TOOLKIT=GTK
GUIDIST=GTK_DIST
@@ -5368,11 +5367,6 @@ fi
if test "$WXGTK2" = 1 ; then
AC_DEFINE_UNQUOTED(__WXGTK20__,$WXGTK2)
WXGTK12=1
fi
if test "$WXGTK12" = 1 ; then
AC_DEFINE_UNQUOTED(__WXGTK12__,$WXGTK12)
fi
if test "$WXGTK127" = 1 ; then
@@ -5409,6 +5403,8 @@ if test "$wxUSE_DEBUG_FLAG" = "no" ; then
if test "$wxUSE_GTK" = 1 ; then
if test "x$wxGTK_VERSION" = "x1" ; then
CPPFLAGS="-DGTK_NO_CHECK_CASTS $CPPFLAGS"
else
CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS"
fi
fi
fi
@@ -5984,6 +5980,20 @@ if test "$wxUSE_BUSYINFO" = "yes"; then
AC_DEFINE(wxUSE_BUSYINFO)
fi
if test "$wxUSE_HOTKEY" = "yes"; then
if test "$wxUSE_MSW" != 1 -a "$wxUSE_OSX_COCOA" != 1 -a "$wxUSE_OSX_CARBON" != 1; then
AC_MSG_WARN([Hot keys not supported by the current toolkit, disabled])
wxUSE_HOTKEY=no
fi
elif test "$wxUSE_HOTKEY" = "auto"; then
if test "$wxUSE_MSW" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_OSX_CARBON" = 1; then
wxUSE_HOTKEY=yes
fi
fi
if test "$wxUSE_HOTKEY" = "yes"; then
AC_DEFINE(wxUSE_HOTKEY)
fi
if test "$wxUSE_STD_CONTAINERS" = "yes"; then
AC_DEFINE(wxUSE_STD_CONTAINERS)
fi
@@ -6632,7 +6642,7 @@ if test "$wxUSE_SVG" = "yes"; then
fi
dnl ---------------------------------------------------------------------------
dnl wxMetafile availability
dnl wxMetafile
dnl ---------------------------------------------------------------------------
if test "$wxUSE_METAFILE" = "yes"; then
@@ -6640,6 +6650,18 @@ if test "$wxUSE_METAFILE" = "yes"; then
AC_MSG_WARN([wxMetafile is not available on this system... disabled])
wxUSE_METAFILE=no
fi
elif test "$wxUSE_METAFILE" = "auto"; then
if test "$wxUSE_MSW" = 1 -o "$wxUSE_MAC" = 1 -o "$wxUSE_PM" = 1; then
wxUSE_METAFILE=yes
fi
fi
if test "$wxUSE_METAFILE" = "yes"; then
AC_DEFINE(wxUSE_METAFILE)
if test "$wxUSE_MSW" = 1; then
dnl this one should probably be made separately configurable
AC_DEFINE(wxUSE_ENH_METAFILE)
fi
fi
dnl ---------------------------------------------------------------------------
@@ -6684,13 +6706,6 @@ if test "$USE_WIN32" = 1 -a \( "$wxUSE_DATAOBJ" = "yes" \
wxUSE_DATAOBJ=no
wxUSE_OLE=no
fi
if test "$wxUSE_METAFILE" = "yes"; then
AC_DEFINE(wxUSE_METAFILE)
dnl this one should probably be made separately configurable
AC_DEFINE(wxUSE_ENH_METAFILE)
fi
fi
if test "$wxUSE_IPC" = "yes"; then
@@ -6730,13 +6745,6 @@ if test "$wxUSE_CLIPBOARD" = "yes"; then
fi
if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
if test "$wxUSE_GTK" = 1; then
if test "$WXGTK12" != 1; then
AC_MSG_WARN([Drag and drop is only supported under GTK+ 1.2... disabled])
wxUSE_DRAG_AND_DROP=no
fi
fi
if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_MGL" = 1 -o \
"$wxUSE_DFB" = 1; then
AC_MSG_WARN([Drag and drop not yet supported under $TOOLKIT... disabled])
@@ -6798,6 +6806,10 @@ if test "$wxUSE_ANIMATIONCTRL" = "yes"; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS animate"
fi
if test "$wxUSE_BANNERWINDOW" = "yes"; then
AC_DEFINE(wxUSE_BANNERWINDOW)
fi
if test "$wxUSE_BUTTON" = "yes"; then
AC_DEFINE(wxUSE_BUTTON)
USES_CONTROLS=1
@@ -7138,6 +7150,11 @@ if test "$wxUSE_TREECTRL" = "yes"; then
fi
fi
if test "$wxUSE_TREECTRL" = "yes"; then
AC_DEFINE(wxUSE_TREELISTCTRL)
USES_CONTROLS=1
fi
if test "$wxUSE_POPUPWIN" = "yes"; then
if test "$wxUSE_OLD_COCOA" = 1 ; then
AC_MSG_WARN([Popup window not yet supported under Mac OS X... disabled])
@@ -7305,10 +7322,6 @@ if test "$wxUSE_MENUS" = "yes"; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS menu"
fi
if test "$wxUSE_METAFILE" = "yes"; then
AC_DEFINE(wxUSE_METAFILE)
fi
if test "$wxUSE_MIMETYPE" = "yes"; then
AC_DEFINE(wxUSE_MIMETYPE)
fi