From 124031d5170ab9a6b7db3e4314b7ab00e9ff92b5 Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Mon, 4 Jan 1999 18:34:42 +0000
Subject: [PATCH] Some small corrections and setup.h additions

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/dirdlg.h      | 2 +-
 include/wx/motif/setup.h | 4 ++++
 include/wx/msw/setup.h   | 4 ++++
 include/wx/stubs/setup.h | 9 +++++++++
 include/wx/zstream.h     | 2 +-
 5 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index 26f944b3f1..2c84771ea5 100644
--- 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 7a02e4c3b3..b1456c86f4 100644
--- 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 700ee34ce5..5ed16a4233 100644
--- 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 8029a0d6a8..9ddf4ee20a 100644
--- 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 75af3270c8..9538abcff6 100644
--- 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