Some small corrections and setup.h additions

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index 26f944b3f1b663877a9a4df5f22e28074dd221bc..2c84771ea5ca680ce5de5d285ac84c5b8e468c5c 100644 (file)
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -2,7 +2,7 @@
 #define _WX_DIRDLG_H_BASE_
 
 #if defined(__WXMSW__)
-#ifdef __WIN16__
+#if defined(__WIN16__) || defined(__GNUWIN32__)
 #include "wx/generic/dirdlgg.h"
 #else
 #include "wx/msw/dirdlg.h"

diff --git a/include/wx/motif/setup.h b/include/wx/motif/setup.h
index 7a02e4c3b35763ec1d58bbd1a25794616b6b2982..b1456c86f4bcf1132b4efe69367c4880c853d86c 100644 (file)
--- a/include/wx/motif/setup.h
+++ b/include/wx/motif/setup.h
@@ -127,6 +127,10 @@
 #define wxUSE_THREADS       0
                                   // Use threads
 
+#define wxUSE_ZLIB          1
+                                  // Use zlib for compression in streams and PNG code
+#define wxUSE_LIBPNG        1
+                                  // Use PNG bitmap code
 /*
  * Finer detail
  *

diff --git a/include/wx/msw/setup.h b/include/wx/msw/setup.h
index 700ee34ce5430a058b05d518cc6ad6ec664607f9..5ed16a4233a922ea825733e5d1ede6762ac330c2 100644 (file)
--- a/include/wx/msw/setup.h
+++ b/include/wx/msw/setup.h
@@ -158,6 +158,10 @@
                                   // support for multithreaded applications: if
                                   // 1, compile in thread classes (thread.h)
                                   // and make the library thread safe
+#define wxUSE_ZLIB          1
+                                  // Use zlib for compression in streams and PNG code
+#define wxUSE_LIBPNG        1
+                                  // Use PNG bitmap code
 /*
  * Finer detail
  *

diff --git a/include/wx/stubs/setup.h b/include/wx/stubs/setup.h
index 8029a0d6a897efa41aa50cb57ec9114d68c1be0f..9ddf4ee20adc8073e726a9f500ab37e2091c4cc1 100644 (file)
--- a/include/wx/stubs/setup.h
+++ b/include/wx/stubs/setup.h
@@ -111,6 +111,15 @@
                                   // if enabled, compiles built-in OS independent wxConfig
                                   // class and it's file (any platform) and registry (Win)
                                   // based implementations
+#define wxUSE_TIMEDATE      1
+                                  // Use time and date
+#define wxUSE_THREADS       0
+                                  // Use threads
+
+#define wxUSE_ZLIB          1
+                                  // Use zlib for compression in streams and PNG code
+#define wxUSE_LIBPNG        1
+                                  // Use PNG bitmap code
 /*
  * Finer detail
  *

diff --git a/include/wx/zstream.h b/include/wx/zstream.h
index 75af3270c857caee9ab3a9236f73d97b55f0f854..9538abcff6d018066e61a4dc2fd0e64d8d23613f 100644 (file)
--- a/include/wx/zstream.h
+++ b/include/wx/zstream.h
@@ -15,7 +15,7 @@
 #pragma interface
 #endif
 
-#include "defs.h"
+#include "wx/defs.h"
 
 #ifdef wxUSE_ZLIB