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

Merged GSOC Ribbon work from SOC2009_RIBBON branch into trunk.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Peter Cawley
2009-09-16 12:06:02 +00:00
parent 1a2df6a75b
commit 3c3ead1d15
126 changed files with 25113 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
configure.in
View File

@@ -792,6 +792,7 @@ WX_ARG_FEATURE(htmlhelp, [ --enable-htmlhelp use wxHTML-based help], w
WX_ARG_FEATURE(xrc, [ --enable-xrc use XRC resources sub-library], wxUSE_XRC)
WX_ARG_FEATURE(aui, [ --enable-aui use AUI docking library], wxUSE_AUI)
WX_ARG_FEATURE(propgrid, [ --enable-propgrid use wxPropertyGrid library], wxUSE_PROPGRID)
WX_ARG_FEATURE(ribbon, [ --enable-ribbon use wxRibbon library], wxUSE_RIBBON)
WX_ARG_FEATURE(stc, [ --enable-stc use wxStyledTextCtrl library], wxUSE_STC)
WX_ARG_FEATURE(constraints, [ --enable-constraints use layout-constraints system], wxUSE_CONSTRAINTS)
WX_ARG_FEATURE(loggui, [ --enable-loggui use standard GUI logger], wxUSE_LOGGUI)
@@ -6971,6 +6972,13 @@ if test "$wxUSE_PROPGRID" = "yes"; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS propgrid"
fi
USE_RIBBON=0
if test "$wxUSE_RIBBON" = "yes"; then
AC_DEFINE(wxUSE_RIBBON)
USE_RIBBON=1
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ribbon"
fi
USE_STC=0
if test "$wxUSE_STC" = "yes"; then
AC_DEFINE(wxUSE_STC)
@@ -7361,6 +7369,9 @@ if test "$wxUSE_GUI" = "yes"; then
if test "$wxUSE_PROPGRID" = "yes" ; then
BUILT_WX_LIBS="propgrid $BUILT_WX_LIBS"
fi
if test "$wxUSE_RIBBON" = "yes" ; then
BUILT_WX_LIBS="ribbon $BUILT_WX_LIBS"
fi
if test "$wxUSE_RICHTEXT" = "yes" ; then
BUILT_WX_LIBS="richtext $BUILT_WX_LIBS"
fi