wxMac merge

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

diff --git a/include/wx/mac/setup.h b/include/wx/mac/setup.h
index 0a1df37e9a419ad9c2116e9ceb45d6cc6ffb322e..bdbcba2aff28fd7680a7e2deeb95781041f80aa1 100644 (file)
--- a/include/wx/mac/setup.h
+++ b/include/wx/mac/setup.h
@@ -17,6 +17,7 @@
  *
  */
  
  *
  */
  

+#define wxUSE_GEOMETRY 1

 #define WORDS_BIGENDIAN 1
 
 #define wxUSE_CONFIG           1
 #define WORDS_BIGENDIAN 1
 
 #define wxUSE_CONFIG           1


@@ -35,7 +36,7 @@
                                 // 0 for no Metafile and metafile device context
 #define wxUSE_IPC         0
                                 // 0 for no interprocess comms
                                 // 0 for no Metafile and metafile device context
 #define wxUSE_IPC         0
                                 // 0 for no interprocess comms

-#define wxUSE_HELP        0
+#define wxUSE_HELP        1

                                 // 0 for no help facility
 #define wxUSE_RESOURCES   1
                                // 0 for no wxGetResource/wxWriteResource
                                 // 0 for no help facility
 #define wxUSE_RESOURCES   1
                                // 0 for no wxGetResource/wxWriteResource


@@ -54,6 +55,7 @@
                                 // 0 for no drag and drop
 
 #define wxUSE_TOOLBAR       1
                                 // 0 for no drag and drop
 
 #define wxUSE_TOOLBAR       1

+#define wxUSE_TOOLBAR_NATIVE       1

                                     // Define 1 to use toolbar classes
 #define wxUSE_BUTTONBAR     1
                                     // Define 1 to use buttonbar classes (enhanced toolbar
                                     // Define 1 to use toolbar classes
 #define wxUSE_BUTTONBAR     1
                                     // Define 1 to use buttonbar classes (enhanced toolbar


@@ -131,7 +133,11 @@
                                   // wxObject::delete *IF* __WXDEBUG__ is also defined.
                                   // WARNING: this code may not work with all architectures, especially
                                   // if alignment is an issue.
                                   // wxObject::delete *IF* __WXDEBUG__ is also defined.
                                   // WARNING: this code may not work with all architectures, especially
                                   // if alignment is an issue.

+#ifndef __MWERKS__
+#define wxUSE_DEBUG_CONTEXT       0
+#else

 #define wxUSE_DEBUG_CONTEXT       1
 #define wxUSE_DEBUG_CONTEXT       1

+#endif

                                   // If 1, enables wxDebugContext, for
                                   // writing error messages to file, etc. 
                                   // If __WXDEBUG__ is not defined, will still use
                                   // If 1, enables wxDebugContext, for
                                   // writing error messages to file, etc. 
                                   // If __WXDEBUG__ is not defined, will still use


@@ -181,9 +187,13 @@
 #define wxUSE_STREAMS       1
                                   // If enabled (1), compiles wxWindows streams classes
 
 #define wxUSE_STREAMS       1
                                   // If enabled (1), compiles wxWindows streams classes
 

+#ifndef __MWERKS__
+#define wxUSE_STD_IOSTREAM     0
+#else

 #define wxUSE_STD_IOSTREAM  1
                                   // Use standard C++ streams if 1. If 0, use wxWin
                                   // streams implementation.
 #define wxUSE_STD_IOSTREAM  1
                                   // Use standard C++ streams if 1. If 0, use wxWin
                                   // streams implementation.

+#endif

 
 #define wxUSE_WXCONFIG      1
                                   // if enabled, compiles built-in OS independent wxConfig
 
 #define wxUSE_WXCONFIG      1
                                   // if enabled, compiles built-in OS independent wxConfig


@@ -197,8 +207,13 @@
                                   // Use zlib for compression in streams and PNG code
 #define wxUSE_LIBPNG        1
                                   // Use PNG bitmap code
                                   // Use zlib for compression in streams and PNG code
 #define wxUSE_LIBPNG        1
                                   // Use PNG bitmap code

-#define wxUSE_LIBJPEG       0
+#define wxUSE_LIBJPEG       1

                                   // Use JPEG bitmap code
                                   // Use JPEG bitmap code

+#define wxUSE_LIBTIFF          1                                  
+                                  // Use TIFF bitmap code
+#define wxUSE_GIF                      1
+                                                                       // Use GIF bitmap code
+                                  

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


@@ -207,10 +222,12 @@
 #define wxUSE_TOOLTIPS      1
                                   // Define to use wxToolTip class and
                                   // wxWindow::SetToolTip() method
 #define wxUSE_TOOLTIPS      1
                                   // Define to use wxToolTip class and
                                   // wxWindow::SetToolTip() method

-#define wxUSE_SOCKETS       0 // 0
+#define wxUSE_SOCKETS       1 // 0

                                   // Set to 1 to use socket classes
 #define wxUSE_HTML          1 // 0
                                   // Set to 1 to use wxHTML sub-library
                                   // Set to 1 to use socket classes
 #define wxUSE_HTML          1 // 0
                                   // Set to 1 to use wxHTML sub-library

+#define wxUSE_FILESYSTEM    1 
+                                 

 #define wxUSE_FS_ZIP        1 // 0
 #define wxUSE_FS_INET       1 // 0     // Set to 1 to enable virtual file systems
 
 #define wxUSE_FS_ZIP        1 // 0
 #define wxUSE_FS_INET       1 // 0     // Set to 1 to enable virtual file systems
 


@@ -255,9 +272,6 @@
 // text entry dialog and wxGetTextFromUser function
 #define wxUSE_TEXTDLG 1
 
 // text entry dialog and wxGetTextFromUser function
 #define wxUSE_TEXTDLG 1
 

-// wxToolBar class
-#define wxUSE_TOOLBAR 1
-

 // wxStatusBar class
 #define wxUSE_STATUSBAR 1
 
 // wxStatusBar class
 #define wxUSE_STATUSBAR 1