X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/be7b32267e114b1873aa5d00d78fa17810f20639..77436c4cbac2269e564dc4fcf4494a58feca0af4:/include/wx/mac/setup.h?ds=sidebyside

diff --git a/include/wx/mac/setup.h b/include/wx/mac/setup.h
index a618ed3f89..c15639c854 100644
--- 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
 // ----------------------------------------------------------------------------
@@ -414,7 +427,7 @@
 #define wxUSE_STATTEXT     1    // wxStaticText
 #define wxUSE_STATBMP      1    // wxStaticBitmap
 #define wxUSE_TEXTCTRL     1    // wxTextCtrl
-#define wxUSE_TOGGLEBTN    1    // requires wxButton
+#define wxUSE_TOGGLEBTN    0    // requires wxButton
 #define wxUSE_TREECTRL     1    // wxTreeCtrl
 
 // Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR
@@ -542,19 +555,13 @@
 // wxValidator class and related methods
 #define wxUSE_VALIDATORS    1
 
+// wxDC cacheing implementation
+#define wxUSE_DC_CACHEING 0
+
 // ----------------------------------------------------------------------------
 // common dialogs
 // ----------------------------------------------------------------------------
 
-// Define 1 to use generic dialogs in Windows, even though they duplicate
-// native common dialog (e.g. wxColourDialog). This is mainly useful for
-// testing.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxUSE_GENERIC_DIALOGS_IN_MSW 0
-
 // On rare occasions (e.g. using DJGPP) may want to omit common dialogs (e.g.
 // file selector, printer dialog). Switching this off also switches off the
 // printing architecture and interactive wxPrinterDC.
@@ -613,6 +620,9 @@
 // number entry dialog
 #define wxUSE_NUMBERDLG 1
 
+// color chooser dialog
+#define wxUSE_COLOURDLG 1
+
 // ----------------------------------------------------------------------------
 // Metafiles support
 // ----------------------------------------------------------------------------
@@ -707,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
@@ -717,17 +727,6 @@
 #define wxUSE_SPLINES     1
                                 // 0 for no splines
 
-#define wxUSE_XPM_IN_MSW   1
-                                // 0 for no XPM support in wxBitmap.
-                                // Default is 1, as XPM is now fully
-                                // supported this makes easier the issue
-                                // of portable icons and bitmaps.
-
-#define wxUSE_IMAGE_LOADING_IN_MSW        1
-                                // Use dynamic DIB loading/saving code in utils/dib under MSW.
-#define wxUSE_RESOURCE_LOADING_IN_MSW     1
-                                // Use dynamic icon/cursor loading/saving code
-                                // under MSW.
 #define wxUSE_WX_RESOURCES        1
                                 // Use .wxr resource mechanism (requires PrologIO library)
 
@@ -744,10 +743,6 @@
 // Set to 1 to use font metric files in GetTextExtent
 #define wxUSE_AFM_FOR_POSTSCRIPT 0
 
-// Set to 0 to disable PostScript print/preview architecture code under Windows
-// (just use Windows printing).
-#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
-
 // ----------------------------------------------------------------------------
 // database classes
 // ----------------------------------------------------------------------------