From 3b14cd750cbaa7a43dac80fe06ecc7e2bb86c256 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 23 Aug 2008 18:30:30 +0000 Subject: [PATCH] always define wxUSE_RICHEDIT[2] -- this is better than never defining them (#9514) [backport from trunk] git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@55211 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- configure | 11 ++++++++++- configure.in | 5 +++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 17791975d4..831f4de1dc 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in 54569 2008-07-10 01:33:28Z RD . +# From configure.in Id: configure.in 55027 2008-08-08 05:09:54Z RD . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for wxWidgets 2.8.8. # @@ -45581,6 +45581,15 @@ _ACEOF USES_CONTROLS=1 SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS text" + + cat >>confdefs.h <<\_ACEOF +#define wxUSE_RICHEDIT 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define wxUSE_RICHEDIT2 1 +_ACEOF + fi if test "$wxUSE_TOGGLEBTN" = "yes"; then diff --git a/configure.in b/configure.in index 0e803449f0..daf644272d 100644 --- a/configure.in +++ b/configure.in @@ -7283,6 +7283,11 @@ if test "$wxUSE_TEXTCTRL" = "yes"; then AC_DEFINE(wxUSE_TEXTCTRL) USES_CONTROLS=1 SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS text" + + dnl we don't have special switches to disable wxUSE_RICHEDIT[2], it doesn't + dnl seem useful to allow disabling them + AC_DEFINE(wxUSE_RICHEDIT) + AC_DEFINE(wxUSE_RICHEDIT2) fi if test "$wxUSE_TOGGLEBTN" = "yes"; then