Compile fix (VC++ 6 doesn't like wxString::Format with only 1 arg: gives several...

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

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index aa0e083733818fd2ee04159b08405ac70023f700..6e2a8de39816d303abaff7434911eae9aa2d4615 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -330,6 +330,16 @@
 // Recommended setting: 1 (but can be safely disabled if you don't use it)
 #define wxUSE_BASE64        1
 
 // Recommended setting: 1 (but can be safely disabled if you don't use it)
 #define wxUSE_BASE64        1
 

+// Set this to 1 to be able to use wxEventLoop even in console applications
+// (i.e. using base library only, without GUI). This is mostly useful for
+// processing socket events but is also necessary to use timers in console
+// applications
+//
+// Default is 1.
+//
+// Recommended setting: 1 (but can be safely disabled if you don't use it)
+#define wxUSE_CONSOLE_EVENTLOOP 1
+

 // Set wxUSE_(F)FILE to 1 to compile wx(F)File classes. wxFile uses low level
 // POSIX functions for file access, wxFFile uses ANSI C stdio.h functions.
 //
 // Set wxUSE_(F)FILE to 1 to compile wx(F)File classes. wxFile uses low level
 // POSIX functions for file access, wxFFile uses ANSI C stdio.h functions.
 //


@@ -481,6 +491,9 @@
 // Joystick support class
 #define wxUSE_JOYSTICK            1
 
 // Joystick support class
 #define wxUSE_JOYSTICK            1
 

+// wxFontEnumerator class
+#define wxUSE_FONTENUM 1
+

 // wxFontMapper class
 #define wxUSE_FONTMAP 1
 
 // wxFontMapper class
 #define wxUSE_FONTMAP 1
 


@@ -745,6 +758,14 @@
 // Recommended setting: 0 (use wxNotebook)
 #define wxUSE_TAB_DIALOG    0
 
 // Recommended setting: 0 (use wxNotebook)
 #define wxUSE_TAB_DIALOG    0
 

+// wxTaskBarIcon is a small notification icon shown in the system toolbar or
+// dock.
+//
+// Default is 1.
+//
+// Recommended setting: 1 (but can be set to 0 if you don't need it)
+#define wxUSE_TASKBARICON 1
+

 // wxGrid class
 //
 // Default is 1, set to 0 to cut down compilation time and binaries size if you
 // wxGrid class
 //
 // Default is 1, set to 0 to cut down compilation time and binaries size if you


@@ -1222,6 +1243,7 @@
 
 /* --- end common options --- */
 
 
 /* --- end common options --- */
 

+/* --- start MSW options --- */

 // ----------------------------------------------------------------------------
 // Windows-only settings
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Windows-only settings
 // ----------------------------------------------------------------------------


@@ -1281,7 +1303,7 @@
 #define wxUSE_DC_CACHEING 1
 
 // Set this to 1 to enable wxDIB class used internally for manipulating
 #define wxUSE_DC_CACHEING 1
 
 // Set this to 1 to enable wxDIB class used internally for manipulating

-// wxBitmao data.
+// wxBitmap data.

 //
 // Default is 1, set it to 0 only if you don't use wxImage neither
 //
 //
 // Default is 1, set it to 0 only if you don't use wxImage neither
 //


@@ -1292,6 +1314,13 @@
 // (just use Windows printing).
 #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
 
 // (just use Windows printing).
 #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
 

+// Set this to 1 to compile in wxRegKey class.
+//
+// Default is 1
+//
+// Recommended setting: 1, this is used internally by wx in a few places
+#define wxUSE_REGKEY 1
+

 // Set this to 1 to use RICHEDIT controls for wxTextCtrl with style wxTE_RICH
 // which allows to put more than ~32Kb of text in it even under Win9x (NT
 // doesn't have such limitation).
 // Set this to 1 to use RICHEDIT controls for wxTextCtrl with style wxTE_RICH
 // which allows to put more than ~32Kb of text in it even under Win9x (NT
 // doesn't have such limitation).


@@ -1320,13 +1349,16 @@
 // Set to 1 to compile MS Windows XP theme engine support
 #define wxUSE_UXTHEME           1
 
 // Set to 1 to compile MS Windows XP theme engine support
 #define wxUSE_UXTHEME           1
 

-// Set to 1 to auto-adapt to MS Windows XP themes where possible
-// (notably, wxNotebook pages)
-#define wxUSE_UXTHEME_AUTO      1
-

 // Set to 1 to use InkEdit control (Tablet PC), if available
 #define wxUSE_INKEDIT  0
 
 // Set to 1 to use InkEdit control (Tablet PC), if available
 #define wxUSE_INKEDIT  0
 

+// Set to 1 to enable .INI files based wxConfig implementation (wxIniConfig)
+//
+// Default is 0.
+//
+// Recommended setting: 0, nobody uses .INI files any more
+#define wxUSE_INICONF 0
+

 // ----------------------------------------------------------------------------
 // Generic versions of native controls
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Generic versions of native controls
 // ----------------------------------------------------------------------------


@@ -1361,5 +1393,7 @@
 // Define 1 to use bitmap messages.
 #define wxUSE_BITMAP_MESSAGE         1
 
 // Define 1 to use bitmap messages.
 #define wxUSE_BITMAP_MESSAGE         1
 

+/* --- end MSW options --- */
+

 #endif // _WX_SETUP_H_
 
 #endif // _WX_SETUP_H_