Finished native wxComboBox implementation; it still needs some testing.

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index ab759d6ee534c47a85063cea17536b8bfb3781e7..94fa9896b92d871569510e8915ea4c37c63a2af0 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -94,6 +94,7 @@
 
 /* PowerPC Darwin & Mac OS X */
 #undef __POWERPC__
 
 /* PowerPC Darwin & Mac OS X */
 #undef __POWERPC__

+#undef TARGET_CARBON

 
 /* MS-DOS with DJGPP */
 #undef __DOS__
 
 /* MS-DOS with DJGPP */
 #undef __DOS__


@@ -103,13 +104,21 @@
 #undef __WINDOWS__
 #endif
 
 #undef __WINDOWS__
 #endif
 

+#ifndef __WIN95__

 #undef __WIN95__
 #undef __WIN95__

+#endif

 #ifndef __WIN32__
 #undef __WIN32__
 #endif
 #ifndef __WIN32__
 #undef __WIN32__
 #endif

+#ifndef __GNUWIN32__

 #undef __GNUWIN32__
 #undef __GNUWIN32__

+#endif
+#ifndef STRICT

 #undef STRICT
 #undef STRICT

+#endif
+#ifndef WINVER

 #undef WINVER
 #undef WINVER

+#endif

 
 /* enable native status bar under Win32 */
 #if defined(__WIN95__) && !defined(__WXUNIVERSAL__)
 
 /* enable native status bar under Win32 */
 #if defined(__WIN95__) && !defined(__WXUNIVERSAL__)