Fixed Windows DLL link problems with wxHtmlProcessor

[wxWidgets.git] / include / wx / msw / setup0.h

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index cd0e2bdde18a5638bfb967cd013f52bade6b2584..b88647d7e054cb423d28c999004b8a64b45ca9fb 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -276,8 +276,6 @@
 // Set to 1 to use socket classes
 #define wxUSE_SOCKETS       1
 
 // Set to 1 to use socket classes
 #define wxUSE_SOCKETS       1
 

-#if wxUSE_GUI
-

 // Set to 1 to enable virtual file systems (required by wxHTML)
 #define wxUSE_FILESYSTEM    1
 
 // Set to 1 to enable virtual file systems (required by wxHTML)
 #define wxUSE_FILESYSTEM    1
 


@@ -294,18 +292,6 @@
 // wxUSE_LIBPNG.
 #define wxUSE_ZLIB          1
 
 // wxUSE_LIBPNG.
 #define wxUSE_ZLIB          1
 

-#else // !wxUSE_GUI
-
-// although it is possible to compile all of those in wxBase, this is not done
-// by default
-#define wxUSE_FILESYSTEM    0
-#define wxUSE_FS_ZIP        0
-#define wxUSE_FS_INET       0
-#define wxUSE_ZIPSTREAM     0
-#define wxUSE_ZLIB          0
-
-#endif // wxUSE_GUI/!wxUSE_GUI
-

 // If enabled, the code written by Apple will be used to write, in a portable
 // way, float on the disk. See extended.c for the license which is different
 // from wxWindows one.
 // If enabled, the code written by Apple will be used to write, in a portable
 // way, float on the disk. See extended.c for the license which is different
 // from wxWindows one.


@@ -379,6 +365,7 @@
 #define wxUSE_SPINCTRL     1
 #define wxUSE_STATLINE     1
 #define wxUSE_STATUSBAR    1
 #define wxUSE_SPINCTRL     1
 #define wxUSE_STATLINE     1
 #define wxUSE_STATUSBAR    1

+#define wxUSE_TOGGLEBTN    1        // requires wxButton

 #define wxUSE_TOOLTIPS     1        // wxToolTip and wxWindow::SetToolTip()
 
 // Two status bar implementations are available under Win32: the generic one
 #define wxUSE_TOOLTIPS     1        // wxToolTip and wxWindow::SetToolTip()
 
 // Two status bar implementations are available under Win32: the generic one


@@ -614,6 +601,9 @@
 // Some formats require an extra library which is included in wxWin sources
 // which is mentioned if it is the case.
 
 // Some formats require an extra library which is included in wxWin sources
 // which is mentioned if it is the case.
 

+// Set to 1 for wxImage support (recommended).
+#define wxUSE_IMAGE         1
+

 // Set to 1 for PNG format support (requires libpng). Also requires wxUSE_ZLIB.
 #define wxUSE_LIBPNG        1
 
 // Set to 1 for PNG format support (requires libpng). Also requires wxUSE_ZLIB.
 #define wxUSE_LIBPNG        1
 


@@ -632,6 +622,9 @@
 // Set to 1 for PCX format support
 #define wxUSE_PCX           1
 
 // Set to 1 for PCX format support
 #define wxUSE_PCX           1
 

+// Set to 1 for XPM format support
+#define wxUSE_XPM           1
+

 // ----------------------------------------------------------------------------
 // Windows-only settings
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Windows-only settings
 // ----------------------------------------------------------------------------


@@ -721,9 +714,11 @@
 // disable the settings which don't work for some compilers
 // ----------------------------------------------------------------------------
 
 // disable the settings which don't work for some compilers
 // ----------------------------------------------------------------------------
 

-#if (defined(__MINGW32__) || defined(__CYGWIN__)) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95)))

 #ifndef wxUSE_NORLANDER_HEADERS
 #ifndef wxUSE_NORLANDER_HEADERS

+#if (defined(__MINGW32__) || defined(__CYGWIN__)) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95)))

 #   define wxUSE_NORLANDER_HEADERS 1
 #   define wxUSE_NORLANDER_HEADERS 1

+#else
+#   define wxUSE_NORLANDER_HEADERS 0

 #endif
 #endif
 
 #endif
 #endif