renamed gsockmot.cpp to *.c

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index ba394ebb0c8fb249566f7ecca9f3f3cb050e4776..b54d6b4a3d1ce78b6257e524df94eb08118c497f 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -79,10 +79,15 @@
 #undef __EMX__
 #undef _GNU_SOURCE
 
 #undef __EMX__
 #undef _GNU_SOURCE
 

+/* Stupid hack; __WINDOWS__ clashes with wx/defs.h */
+#ifndef __WINDOWS__

 #undef __WINDOWS__
 #undef __WINDOWS__

+#endif
+

 #undef __WIN95__
 #undef __WIN32__
 #undef __GNUWIN32__
 #undef __WIN95__
 #undef __WIN32__
 #undef __GNUWIN32__

+#undef STRICT

 #undef WINVER
 
 /*
 #undef WINVER
 
 /*


@@ -102,10 +107,6 @@
  * Use libjpeg
  */
 #define wxUSE_LIBJPEG 0
  * Use libjpeg
  */
 #define wxUSE_LIBJPEG 0

-/*
- * Use libgif
- */
-#define wxUSE_LIBGIF 0

 /*
  * Use iODBC
  */
 /*
  * Use iODBC
  */


@@ -280,6 +281,7 @@
 #define wxUSE_TOOLBAR 0
 
 #if defined(__WXWINE__) || defined(__GNUWIN32__)
 #define wxUSE_TOOLBAR 0
 
 #if defined(__WXWINE__) || defined(__GNUWIN32__)

+#define wxUSE_OWNER_DRAWN 1 

   #if wxUSE_TOOLBAR
     #define wxUSE_BUTTONBAR 1
   #endif
   #if wxUSE_TOOLBAR
     #define wxUSE_BUTTONBAR 1
   #endif


@@ -535,6 +537,20 @@
  */
 #define wxUSE_ZIPSTREAM 0
 
  */
 #define wxUSE_ZIPSTREAM 0
 

+/*
+ * GIF image format support
+ */
+#define wxUSE_GIF 0
+
+/*
+ * PCX image format support
+ */
+#define wxUSE_PCX 0
+
+/*
+ * PNM image format support
+ */
+#define wxUSE_PNM 0

  
 /*
  * Disable this if your compiler can't cope
  
 /*
  * Disable this if your compiler can't cope