hopefully fixed bytesex issues in strconv

[wxWidgets.git] / configure.in

diff --git a/configure.in b/configure.in
index 38d4ad92f98ae4f76cda373ab2d0c03f5963430b..f0f79f626e48313e54d8114e8e408affbb46f137 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -700,6 +700,7 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_COLOURDLG=no
   DEFAULT_wxUSE_DIRDLG=no
   DEFAULT_wxUSE_FILEDLG=no
+  DEFAULT_wxUSE_FINDREPLDLG=no
   DEFAULT_wxUSE_FONTDLG=no
   DEFAULT_wxUSE_MSGDLG=no
   DEFAULT_wxUSE_NUMBERDLG=no
@@ -857,6 +858,7 @@ else
   DEFAULT_wxUSE_COLOURDLG=yes
   DEFAULT_wxUSE_DIRDLG=yes
   DEFAULT_wxUSE_FILEDLG=yes
+  DEFAULT_wxUSE_FINDREPLDLG=yes
   DEFAULT_wxUSE_FONTDLG=yes
   DEFAULT_wxUSE_MSGDLG=yes
   DEFAULT_wxUSE_NUMBERDLG=yes
@@ -1246,6 +1248,7 @@ WX_ARG_ENABLE(commondlg,   [  --enable-commondlg      use common dialogs (wxDirD
 WX_ARG_ENABLE(choicedlg,   [  --enable-choicedlg      use wxChoiceDialog], wxUSE_CHOICEDLG)
 WX_ARG_ENABLE(coldlg,      [  --enable-coldlg         use wxColourDialog], wxUSE_COLOURDLG)
 WX_ARG_ENABLE(filedlg,     [  --enable-filedlg        use wxFileDialog], wxUSE_FILEDLG)
+WX_ARG_ENABLE(filedlg,     [  --enable-finddlg        use wxFindReplaceDialog], wxUSE_FINDREPLDLG)
 WX_ARG_ENABLE(fontdlg,     [  --enable-fontdlg        use wxFontDialog], wxUSE_FONTDLG)
 WX_ARG_ENABLE(dirdlg,      [  --enable-dirdlg         use wxDirDialog], wxUSE_DIRDLG)
 WX_ARG_ENABLE(msgdlg,      [  --enable-msgdlg         use wxMessageDialog], wxUSE_MSGDLG)
@@ -1603,14 +1606,6 @@ if test "$wxUSE_GUI" = "yes"; then
 
         INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS msw"
 
-        dnl VZ: my mingw32 doesn't define WINVER which means that __WIN95__ is
-        dnl     not defined in wx/defs.h and all kinds of things break so I
-        dnl     add it here
-        dnl
-        dnl     if newer versions of mingw32 do define it, we should
-        dnl     explicitly test for this
-        CXXFLAGS="${CXXFLAGS} -DWINVER=0x0400"
-
         dnl --- Quick & Dirty ; link against most/all libraries
         dnl --- This will bloat the executable, but it'll work for now...
         LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -ladvapi32 -lwsock32"
@@ -4395,6 +4390,10 @@ if test "$wxUSE_FILEDLG" = "yes"; then
     AC_DEFINE(wxUSE_FILEDLG)
 fi
 
+if test "$wxUSE_FINDREPLDLG" = "yes"; then
+    AC_DEFINE(wxUSE_FINDREPLDLG)
+fi
+
 if test "$wxUSE_FONTDLG" = "yes"; then
     AC_DEFINE(wxUSE_FONTDLG)
 fi