X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c0e69d720d8b15f788fe0998806f18c46f7d5d8b..9e96e16fe0bc7af32d329c965ad110a3e5be5ad8:/include/wx/msw/setup0.h

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index a85d303489..0391162f33 100644
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -655,28 +655,17 @@
 // Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced
 // 2D drawing API.  (Still somewhat experimental)
 //
-// Please note that on Windows you will need to link with gdiplus.lib (use
-// USE_GDIPLUS=1 for makefile builds) and distribute gdiplus.dll with your
-// application if you want it to be runnable on pre-XP systems.
+// Please note that on Windows gdiplus.dll is loaded dynamically which means
+// that nothing special needs to be done as long as you don't use
+// wxGraphicsContext at all or only use it on XP and later systems but you
+// still do need to distribute it yourself for an application using
+// wxGraphicsContext to be runnable on pre-XP systems.
 //
-// Default is 0
-//
-// Recommended setting: 1
-#ifndef wxUSE_GRAPHICS_CONTEXT
-#define wxUSE_GRAPHICS_CONTEXT 0
-#endif
-
-// Enable the new wxCairoContext classes for an advanced
-// 2D drawing API.  (Still somewhat experimental)
-//
-// Please note that you will need to link with Cairo for this to work.
-//
-// Default is 0
+// Default is 1 if the compiler has gdiplus.h (currently only MSVC 7+ under
+// Windows is known to).
 //
 // Recommended setting: 1
-#ifndef wxUSE_CAIRO
-#define wxUSE_CAIRO 0
-#endif
+#define wxUSE_GRAPHICS_CONTEXT 1
 
 // ----------------------------------------------------------------------------
 // Individual GUI controls
@@ -1225,6 +1214,11 @@
 #define wxUSE_MOUSEWHEEL        1
                                 // Include mouse wheel support
 
+// Compile wxUIActionSimulator class?
+//
+// This is experimental code subject to change. It's not fully implemented yet.
+#define wxUSE_UIACTIONSIMULATOR 0
+
 // ----------------------------------------------------------------------------
 // wxDC classes for various output formats
 // ----------------------------------------------------------------------------