For wxMSW, split XPM handler into separate file (please add handler explicitly in...

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

diff --git a/include/wx/motif/setup.h b/include/wx/motif/setup.h
index 8b9f9762e54ce46a7fdd77b8a1f1fe53856298b8..d2242990931e253d4a60481c5d384e2a458ef385 100644 (file)
--- a/include/wx/motif/setup.h
+++ b/include/wx/motif/setup.h
@@ -76,7 +76,7 @@
                                   // NOW MANDATORY: don't change.
 #define wxUSE_MEMORY_TRACING      1
                                   // If 1, enables debugging versions of wxObject::new and
                                   // NOW MANDATORY: don't change.
 #define wxUSE_MEMORY_TRACING      1
                                   // If 1, enables debugging versions of wxObject::new and

-                                  // wxObject::delete *IF* WXDEBUG is also defined.
+                                  // wxObject::delete *IF* __WXDEBUG__ is also defined.

                                   // WARNING: this code may not work with all architectures, especially
                                   // if alignment is an issue.
 #define wxUSE_DEBUG_CONTEXT       1
                                   // WARNING: this code may not work with all architectures, especially
                                   // if alignment is an issue.
 #define wxUSE_DEBUG_CONTEXT       1


@@ -88,11 +88,15 @@
                                   // since you may well need to output
                                   // an error log in a production
                                   // version (or non-debugging beta)
                                   // since you may well need to output
                                   // an error log in a production
                                   // version (or non-debugging beta)

-#define wxUSE_GLOBAL_MEMORY_OPERATORS 0
+
+#define wxUSE_GLOBAL_MEMORY_OPERATORS 1

                                   // In debug mode, cause new and delete to be redefined globally.
                                   // If this causes problems (e.g. link errors), set this to 0.
                                   // In debug mode, cause new and delete to be redefined globally.
                                   // If this causes problems (e.g. link errors), set this to 0.

-                                  // In wxMotif, causes an 'all bets are off'
-                                  // memory error (generated by wxWindows)
+
+#define wxUSE_DEBUG_NEW_ALWAYS 1
+                                  // In debug mode, causes new to be defined to
+                                  // be WXDEBUG_NEW (see object.h).
+                                  // If this causes problems (e.g. link errors), set this to 0.

 
 #define REMOVE_UNUSED_ARG 1
                                   // Set this to 0 if your compiler can't cope
 
 #define REMOVE_UNUSED_ARG 1
                                   // Set this to 0 if your compiler can't cope


@@ -117,11 +121,19 @@
 #define wxUSE_GADGETS       0
                                   // Use gadgets where possible
 
 #define wxUSE_GADGETS       0
                                   // Use gadgets where possible
 

-#define wxUSE_MDI_WIDGETS   1
-                                  // Use Scott Sadler's MDI widgets (buggy).
-                                  // If 0, uses normal frames.
-                 
+#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
+#define wxUSE_STD_IOSTREAM  1
+                                  // Use standard C++ streams if 1. If 0, use wxWin
+                                  // streams implementation.

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