Added possibility of 2-step initialisation, and wxWIZARD_EX_HELPBUTTON style.

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

diff --git a/include/wx/mac/setup.h b/include/wx/mac/setup.h
index a3bca25ad47f41583a103a2393a85ba15bb9a6ff..c15639c854368b0e037bf10bd51554b136c6b9d3 100644 (file)
--- a/include/wx/mac/setup.h
+++ b/include/wx/mac/setup.h
@@ -183,7 +183,7 @@
 
 // Recommended setting: 1 (always)
 #define wxUSE_LOGWINDOW 1
-
+#define wxUSE_LOG_DIALOG 0
 // Recommended setting: 1 (always)
 #define wxUSE_LOGGUI 1
 
@@ -365,6 +365,19 @@
 // wxMimeTypesManager class
 #define wxUSE_MIMETYPE 1
 
+// wxSystemOptions class
+#define wxUSE_SYSTEM_OPTIONS 1
+
+// Support for regular expression matching via wxRegEx class: enable this to
+// use POSIX regular expressions in your code. You need to compile regex
+// library from src/regex to use it under Windows.
+//
+// Default is 0
+//
+// Recommended setting: 1 if your compiler supports it, if it doesn't please
+// contribute us a makefile for src/regex for it
+#define wxUSE_REGEX       0
+
 // ----------------------------------------------------------------------------
 // Individual GUI controls
 // ----------------------------------------------------------------------------
@@ -542,6 +555,9 @@
 // wxValidator class and related methods
 #define wxUSE_VALIDATORS    1
 
+// wxDC cacheing implementation
+#define wxUSE_DC_CACHEING 0
+
 // ----------------------------------------------------------------------------
 // common dialogs
 // ----------------------------------------------------------------------------
@@ -604,6 +620,9 @@
 // number entry dialog
 #define wxUSE_NUMBERDLG 1
 
+// color chooser dialog
+#define wxUSE_COLOURDLG 1
+
 // ----------------------------------------------------------------------------
 // Metafiles support
 // ----------------------------------------------------------------------------
@@ -698,7 +717,7 @@
                                 // 0 for no interprocess comms
 #define wxUSE_HELP        1
                                 // 0 for no help facility
-#define wxUSE_MS_HTML_HELP 0
+#define wxUSE_WXHTML_HELP 1
                                 // 0 for no MS HTML Help
 #define wxUSE_RESOURCES   1
                                 // 0 for no wxGetResource/wxWriteResource