wxComboBox included (removed dependency on wxUSE_COMBOBOX which was never

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

diff --git a/include/wx/motif/setup.h b/include/wx/motif/setup.h
index 74e0dbb668aa3622e367d3b11e16b8354273dab9..d2242990931e253d4a60481c5d384e2a458ef385 100644 (file)
--- a/include/wx/motif/setup.h
+++ b/include/wx/motif/setup.h
@@ -51,8 +51,13 @@
 // AIAI spline code is slower, but freer of copyright issues.
                                // 0 for no splines
 
-#define wxUSE_TOOLBAR     1
-                            // Use toolbars
+#define wxUSE_XPM                 1
+                                // Use XPMs
+
+#define wxUSE_TOOLBAR             1
+                                // Use toolbars
+#define wxUSE_COMBOBOX            1
+                                // Use wxComboBox
 #define wxUSE_DRAG_AND_DROP 1
                                // 0 for no drag and drop
 
@@ -71,7 +76,7 @@
                                   // 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
@@ -83,11 +88,15 @@
                                   // 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 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
@@ -108,6 +117,23 @@
                                   // if enabled, compiles built-in OS independent wxConfig
                                   // class and it's file (any platform) and registry (Win)
                                   // based implementations
+
+#define wxUSE_GADGETS       0
+                                  // Use gadgets where possible
+
+#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
  *