MSW compilation fixes - widgets sample runs!

[wxWidgets.git] / include / wx / mac / setup.h

diff --git a/include/wx/mac/setup.h b/include/wx/mac/setup.h
index f4e14e5cb71786bd3d9f16bda4000e6b671e7470..2906ca1642521446677902807384bf802ae8d5df 100644 (file)
--- a/include/wx/mac/setup.h
+++ b/include/wx/mac/setup.h
@@ -85,6 +85,8 @@
 
 #define wxUSE_SPINBTN 1
 
 
 #define wxUSE_SPINBTN 1
 

+#define wxUSE_SPINCTRL 1
+

 #define wxUSE_NOTEBOOK 1
                                     // Define 1 to compile spin button
 
 #define wxUSE_NOTEBOOK 1
                                     // Define 1 to compile spin button
 


@@ -163,7 +165,7 @@
                                   // Set this to 0 if your compiler can't cope
                                   // with omission of prototype parameters.
 
                                   // Set this to 0 if your compiler can't cope
                                   // with omission of prototype parameters.
 

-#define wxUSE_ODBC                   1
+#define wxUSE_ODBC                   0

                                     // Define 1 to use ODBC classes
 
 
                                     // Define 1 to use ODBC classes
 
 


@@ -207,6 +209,22 @@
                                   // and make the library thread safe
 #define wxUSE_ZLIB          1
                                   // Use zlib for compression in streams and PNG code
                                   // and make the library thread safe
 #define wxUSE_ZLIB          1
                                   // Use zlib for compression in streams and PNG code

+
+// ----------------------------------------------------------------------------
+// image format support
+// ----------------------------------------------------------------------------
+
+// wxImage supports many different image formats which can be configured at
+// compile-time. BMP is always supported, others are optional and can be safely
+// disabled if you don't plan to use images in such format sometimes saving
+// substantial amount of code in the final library.
+//
+// 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
+

 #define wxUSE_LIBPNG        1
                                   // Use PNG bitmap code
 #define wxUSE_LIBJPEG       1
 #define wxUSE_LIBPNG        1
                                   // Use PNG bitmap code
 #define wxUSE_LIBJPEG       1


@@ -216,9 +234,18 @@
 #define wxUSE_GIF                      1
                                                                        // Use GIF bitmap code
                                   
 #define wxUSE_GIF                      1
                                                                        // Use GIF bitmap code
                                   

+// Set to 1 for PNM format support
+#define wxUSE_PNM           1
+
+// Set to 1 for PCX format support
+#define wxUSE_PCX           1
+
+// Set to 1 for XPM format support
+#define wxUSE_XPM           1
+

 #define wxUSE_SERIAL        0
                                   // Use serialization (requires utils/serialize)
 #define wxUSE_SERIAL        0
                                   // Use serialization (requires utils/serialize)

-#define wxUSE_DYNLIB_CLASS  0
+#define wxUSE_DYNLIB_CLASS  1

                                   // Compile in wxLibrary class for run-time
                                   // DLL loading and function calling
 #define wxUSE_TOOLTIPS      1
                                   // Compile in wxLibrary class for run-time
                                   // DLL loading and function calling
 #define wxUSE_TOOLTIPS      1


@@ -240,6 +267,8 @@
 #define wxUSE_ZIPSTREAM     1 // 0
                                   // input stream for reading from zip archives
 
 #define wxUSE_ZIPSTREAM     1 // 0
                                   // input stream for reading from zip archives
 

+// OpenGL canvas
+#define wxUSE_GLCANVAS       1

 /*
  * Finer detail
  *
 /*
  * Finer detail
  *