Fixes for segfaults when the parent frame is destroyed

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 49e7b3ddc17d83b8038887f052f138ab7e6d3d53..b9ba86f943e3440c78612e9d3b8d7e4524ca2f62 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -125,9 +125,6 @@
 #undef __WINDOWS__
 #endif
 
-#ifndef __WIN95__
-#undef __WIN95__
-#endif
 #ifndef __WIN32__
 #undef __WIN32__
 #endif
@@ -332,6 +329,7 @@
 #define wxUSE_RADIOBOX      0
 #define wxUSE_RADIOBTN      0
 #define wxUSE_SCROLLBAR     0
+#define wxUSE_SEARCHCTRL    0
 #define wxUSE_SLIDER        0
 #define wxUSE_SPINBTN       0
 #define wxUSE_SPINCTRL      0
@@ -540,13 +538,13 @@
 
 /* for some features we don't have dedicated configure switches, so just choose
  * the common values automatically */
-#if (defined(__WIN95__) && !defined(__WXUNIVERSAL__)) || defined(__WXPM__)
+#if (defined(__WIN32__) && !defined(__WXUNIVERSAL__)) || defined(__WXPM__)
 #define wxUSE_OWNER_DRAWN 1
 #else
 #define wxUSE_OWNER_DRAWN 0
 #endif
 
-#if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
+#if defined(__WIN32__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
 #define wxUSE_RICHEDIT 1
 #define wxUSE_RICHEDIT2 1
 #else