Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/gtk/setup0.h b/include/wx/gtk/setup0.h
index b0d04366eb46010840cb4d3ed136e1c99925a3c6..ba0bee22fc0c1c847da2608c879888cd72bc4ca1 100644 (file)
--- a/include/wx/gtk/setup0.h
+++ b/include/wx/gtk/setup0.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -1098,6 +1097,16 @@
 // Recommended setting: 1
 #define wxUSE_NOTIFICATION_MESSAGE 1
 
 // Recommended setting: 1
 #define wxUSE_NOTIFICATION_MESSAGE 1
 

+// wxPreferencesEditor provides a common API for different ways of presenting
+// the standard "Preferences" or "Properties" dialog under different platforms
+// (e.g. some use modal dialogs, some use modeless ones; some apply the changes
+// immediately while others require an explicit "Apply" button).
+//
+// Default is 1.
+//
+// Recommended setting: 1 (but can be safely disabled if you don't use it)
+#define wxUSE_PREFERENCES_EDITOR 1
+

 // wxRichToolTip is a customizable tooltip class which has more functionality
 // than the stock (but native, unlike this class) wxToolTip.
 //
 // wxRichToolTip is a customizable tooltip class which has more functionality
 // than the stock (but native, unlike this class) wxToolTip.
 //


@@ -1649,12 +1658,8 @@
 // exact GTK version (without including GTK+ headers that we don't want to
 // include from our own public headers), just assume a recent GTK 2.x.
 #define __WXGTK20__
 // exact GTK version (without including GTK+ headers that we don't want to
 // include from our own public headers), just assume a recent GTK 2.x.
 #define __WXGTK20__

-#define __WXGTK26__

 #define __WXGTK210__
 #define __WXGTK218__
 #define __WXGTK210__
 #define __WXGTK218__

-
-// Alternatively, all the above symbols could be commented and this one
-// uncommented if using GTK+ 3.
-//#define __WXGTK30__
+//#define __WXGTK3__

 
 #endif // _WX_SETUP_H_
 
 #endif // _WX_SETUP_H_