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

wxUSE_NEW_GRID implies wxUSE_GRID

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6169 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-02-21 13:19:03 +00:00
parent ea968ccd07
commit d6a55c4bc2
2 changed files with 486 additions and 504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

970
configure vendored
View File

File diff suppressed because it is too large Load Diff

20
configure.in
View File

@@ -475,6 +475,8 @@ DEFAULT_DEFAULT_wxUSE_MSW=0
DEFAULT_DEFAULT_wxUSE_WINE=0 DEFAULT_DEFAULT_wxUSE_WINE=0
DEFAULT_DEFAULT_wxUSE_PM=0 DEFAULT_DEFAULT_wxUSE_PM=0
PROGRAM_EXT=
dnl to support a new system, you need to add its canonical name (as determined dnl to support a new system, you need to add its canonical name (as determined
dnl by config.sub or specified by the configure command line) to this "case" dnl by config.sub or specified by the configure command line) to this "case"
dnl and also define the shared library flags below - search for dnl and also define the shared library flags below - search for
@@ -1214,7 +1216,6 @@ case "${host}" in
*) *)
PATH_IFS=':' PATH_IFS=':'
LEX_STEM="lex.yy" LEX_STEM="lex.yy"
PROGRAM_EXT=
;; ;;
esac esac
@@ -3132,16 +3133,17 @@ if test "$wxUSE_GAUGE" = "yes"; then
AC_DEFINE(wxUSE_GAUGE) AC_DEFINE(wxUSE_GAUGE)
fi fi
if test "$wxUSE_NEW_GRID" = "yes"; then
wxUSE_GRID="yes"
AC_DEFINE(wxUSE_NEW_GRID)
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS newgrid"
fi
if test "$wxUSE_GRID" = "yes"; then if test "$wxUSE_GRID" = "yes"; then
AC_DEFINE(wxUSE_GRID) AC_DEFINE(wxUSE_GRID)
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid" SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid"
fi fi
if test "$wxUSE_NEW_GRID" = "yes"; then
AC_DEFINE(wxUSE_NEW_GRID)
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS newgrid"
fi
if test "$wxUSE_IMAGLIST" = "yes"; then if test "$wxUSE_IMAGLIST" = "yes"; then
AC_DEFINE(wxUSE_IMAGLIST) AC_DEFINE(wxUSE_IMAGLIST)
fi fi
@@ -3371,8 +3373,7 @@ dnl C/C++ compiler options used to compile wxWindows
if test "$GXX" = yes ; then if test "$GXX" = yes ; then
dnl CXXWARNINGS="-Wall -W -Wcast-qual -Werror" dnl CXXWARNINGS="-Wall -W -Wcast-qual -Werror"
CXXWARNINGS="-Wall" CXXWARNINGS="-Wall"
dnl FIXME: there is one weird warning in docview.h:71 which prevents me from dnl should enable this one day...
dnl doing this... (VZ)
dnl CXXWARNINGS="-Wall -Werror" dnl CXXWARNINGS="-Wall -Werror"
fi fi
EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE $INCLUDES" EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE $INCLUDES"
@@ -3401,7 +3402,8 @@ dnl for convenience, sort the samples in alphabetical order
dnl dnl
dnl FIXME For some mysterious reasons, sometimes the directories are duplicated dnl FIXME For some mysterious reasons, sometimes the directories are duplicated
dnl in this list - hence uniq. But normally, this shouldn't be needed! dnl in this list - hence uniq. But normally, this shouldn't be needed!
dnl Unfortunately, there is a bug in OS/2's tr, such that dnl
dnl Unfortunately, there is a bug in OS/2's tr, such that
dnl tr ' ' '\n' introduces DOS-like line breaks, whereas tr '\n' ' ' dnl tr ' ' '\n' introduces DOS-like line breaks, whereas tr '\n' ' '
dnl only removes the Unix-like part of the introduced line break. dnl only removes the Unix-like part of the introduced line break.
SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`" SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`"