Move "static" keyword out from wxDEPRECATED() macros to placate icc.

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

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index de0741498c730f7e312ce903bd350228a09fb699..703e872ad9dbf0095697cee40272275d65fc79ff 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -470,13 +470,13 @@
 #define wxUSE_DIALUP_MANAGER   1
 
 // Compile in classes for run-time DLL loading and function calling.
 #define wxUSE_DIALUP_MANAGER   1
 
 // Compile in classes for run-time DLL loading and function calling.

-// Required by wxUSE_DIALUP_MANAGER and used by many other wxMSW classes so
-// disabling it can result in a loss of a lot of functionality, don't do it
-// unless you really know what you are doing.
+// Required by wxUSE_DIALUP_MANAGER.
+//
+// This setting is for Win32 only

 //
 // Default is 1.
 //
 //
 // Default is 1.
 //

-// Recommended setting: 1 (you should never disable this for wxMSW).
+// Recommended setting: 1

 #define wxUSE_DYNLIB_CLASS    1
 
 // experimental, don't use for now
 #define wxUSE_DYNLIB_CLASS    1
 
 // experimental, don't use for now


@@ -912,6 +912,29 @@
 // wxAcceleratorTable/Entry classes and support for them in wxMenu(Bar)
 #define wxUSE_ACCEL 1
 
 // wxAcceleratorTable/Entry classes and support for them in wxMenu(Bar)
 #define wxUSE_ACCEL 1
 

+// Use the standard art provider. The icons returned by this provider are
+// embedded into the library as XPMs so disabling it reduces the library size
+// somewhat but this should only be done if you use your own custom art
+// provider returning the icons or never use any icons not provided by the
+// native art provider (which might not be implemented at all for some
+// platforms) or by the Tango icons provider (if it's not itself disabled
+// below).
+//
+// Default is 1.
+//
+// Recommended setting: 1 unless you use your own custom art provider.
+#define wxUSE_ARTPROVIDER_STD 1
+
+// Use art provider providing Tango icons: this art provider has higher quality
+// icons than the default ones using smaller size XPM icons without
+// transparency but the embedded PNG icons add to the library size.
+//
+// Default is 1 under non-GTK ports. Under wxGTK the native art provider using
+// the GTK+ stock icons replaces it so it is normally not necessary.
+//
+// Recommended setting: 1 but can be turned off to reduce the library size.
+#define wxUSE_ARTPROVIDER_TANGO 1
+

 // Hotkey support (currently Windows only)
 #define wxUSE_HOTKEY 1
 
 // Hotkey support (currently Windows only)
 #define wxUSE_HOTKEY 1