Fixed typo in my last commit (it did break socket detection code :-( ).

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

diff --git a/include/wx/msw/setup_microwin.h b/include/wx/msw/setup_microwin.h
index 3a80e8aef4bfc5de36d01dd7542e0152fe7ab51d..70d8e11dc44802fb23131ecba30a0eea82d5f11b 100644 (file)
--- a/include/wx/msw/setup_microwin.h
+++ b/include/wx/msw/setup_microwin.h
@@ -117,7 +117,7 @@
 // Default is 1
 //
 // Recommended setting: 1 but see comment in the beginning of this section
 // Default is 1
 //
 // Recommended setting: 1 but see comment in the beginning of this section

-#define wxUSE_MEMORY_TRACING 1
+#define wxUSE_MEMORY_TRACING 0

 
 // In debug mode, cause new and delete to be redefined globally.
 // If this causes problems (e.g. link errors), set this to 0.
 
 // In debug mode, cause new and delete to be redefined globally.
 // If this causes problems (e.g. link errors), set this to 0.


@@ -172,6 +172,18 @@
 // Recommended setting: 0 (unless you only plan to use Windows NT/2000)
 #define wxUSE_UNICODE 0
 
 // Recommended setting: 0 (unless you only plan to use Windows NT/2000)
 #define wxUSE_UNICODE 0
 

+// Set wxUSE_UNICODE_MSLU to 1 if you want to compile wxWindows in Unicode mode
+// and be able to run compiled apps under Windows 9x as well as NT/2000/XP. This
+// setting enables use of unicows.dll from MSLU (MS Layer for Unicode, see
+// http://www.microsoft.com/globaldev/Articles/mslu_announce.asp). Note that you
+// will have to modify the makefiles to include unicows.lib import library as the first
+// library.
+//
+// Default is 0
+//
+// Recommended setting: 0
+#define wxUSE_UNICODE_MSLU 0
+

 // Setting wxUSE_WCHAR_T to 1 gives you some degree of Unicode support without
 // compiling the program in Unicode mode. More precisely, it will be possible
 // to construct wxString from a wide (Unicode) string and convert any wxString
 // Setting wxUSE_WCHAR_T to 1 gives you some degree of Unicode support without
 // compiling the program in Unicode mode. More precisely, it will be possible
 // to construct wxString from a wide (Unicode) string and convert any wxString


@@ -350,6 +362,8 @@
 // Default is 1.
 //
 // Recommended setting: 1
 // Default is 1.
 //
 // Recommended setting: 1

+#define wxUSE_DYNAMIC_LOADER  0
+

 #define wxUSE_DYNLIB_CLASS  0
 
 // Set to 1 to use socket classes
 #define wxUSE_DYNLIB_CLASS  0
 
 // Set to 1 to use socket classes


@@ -424,6 +438,14 @@
 // Recommended setting: 0
 #define wxUSE_POPUPWIN     1
 
 // Recommended setting: 0
 #define wxUSE_POPUPWIN     1
 

+// wxTipWindow allows to implement the custom tooltips, it is used by the
+// context help classes. Requires wxUSE_POPUPWIN.
+//
+// Default is 1
+//
+// Recommended setting: 1 (may be set to 0)
+#define wxUSE_TIPWINDOW    1
+

 // Each of the settings below corresponds to one wxWindows control. They are
 // all switched on by default but may be disabled if you are sure that your
 // program (including any standard dialogs it can show!) doesn't need them and
 // Each of the settings below corresponds to one wxWindows control. They are
 // all switched on by default but may be disabled if you are sure that your
 // program (including any standard dialogs it can show!) doesn't need them and


@@ -437,18 +459,18 @@
 #define wxUSE_BMPBUTTON    1    // wxBitmapButton
 #define wxUSE_CALENDARCTRL 0    // wxCalendarCtrl
 #define wxUSE_CHECKBOX     1    // wxCheckBox
 #define wxUSE_BMPBUTTON    1    // wxBitmapButton
 #define wxUSE_CALENDARCTRL 0    // wxCalendarCtrl
 #define wxUSE_CHECKBOX     1    // wxCheckBox

-#define wxUSE_CHECKLISTBOX 0    // wxCheckListBox (requires wxUSE_OWNER_DRAWN)
+#define wxUSE_CHECKLISTBOX 1    // wxCheckListBox (requires wxUSE_OWNER_DRAWN)

 #define wxUSE_CHOICE       1    // wxChoice
 #define wxUSE_COMBOBOX     1    // wxComboBox
 #define wxUSE_CHOICE       1    // wxChoice
 #define wxUSE_COMBOBOX     1    // wxComboBox

-#define wxUSE_GAUGE        0    // wxGauge
+#define wxUSE_GAUGE        1    // wxGauge

 #define wxUSE_LISTBOX      1    // wxListBox
 #define wxUSE_LISTCTRL     0    // wxListCtrl
 #define wxUSE_LISTBOX      1    // wxListBox
 #define wxUSE_LISTCTRL     0    // wxListCtrl

-#define wxUSE_RADIOBOX     0    // wxRadioBox
+#define wxUSE_RADIOBOX     1    // wxRadioBox

 #define wxUSE_RADIOBTN     1    // wxRadioButton
 #define wxUSE_SCROLLBAR    1    // wxScrollBar
 #define wxUSE_SLIDER       1    // wxSlider
 #define wxUSE_RADIOBTN     1    // wxRadioButton
 #define wxUSE_SCROLLBAR    1    // wxScrollBar
 #define wxUSE_SLIDER       1    // wxSlider

-#define wxUSE_SPINBTN      0    // wxSpinButton
-#define wxUSE_SPINCTRL     0    // wxSpinCtrl
+#define wxUSE_SPINBTN      1    // wxSpinButton
+#define wxUSE_SPINCTRL     1    // wxSpinCtrl

 #define wxUSE_STATBOX      1    // wxStaticBox
 #define wxUSE_STATLINE     1    // wxStaticLine
 #define wxUSE_STATTEXT     1    // wxStaticText
 #define wxUSE_STATBOX      1    // wxStaticBox
 #define wxUSE_STATLINE     1    // wxStaticLine
 #define wxUSE_STATTEXT     1    // wxStaticText


@@ -499,7 +521,7 @@
 // Default is 1.
 //
 // Recommended setting: 1
 // Default is 1.
 //
 // Recommended setting: 1

-#define wxUSE_NOTEBOOK 0
+#define wxUSE_NOTEBOOK 1

 
 // wxTabDialog is a generic version of wxNotebook but it is incompatible with
 // the new class. It shouldn't be used in new code.
 
 // wxTabDialog is a generic version of wxNotebook but it is incompatible with
 // the new class. It shouldn't be used in new code.


@@ -552,7 +574,7 @@
 //
 // Recommended setting: 1 (set it to 0 if you don't use any of the controls
 // enumerated above, then this class is mostly useless too)
 //
 // Recommended setting: 1 (set it to 0 if you don't use any of the controls
 // enumerated above, then this class is mostly useless too)

-#define wxUSE_IMAGLIST      0
+#define wxUSE_IMAGLIST      1

 
 // Use wxMenu, wxMenuBar, wxMenuItem.
 //
 
 // Use wxMenu, wxMenuBar, wxMenuItem.
 //


@@ -619,7 +641,7 @@
 // Default is 1
 //
 // Recommended setting: 1 (used in the library itself)
 // Default is 1
 //
 // Recommended setting: 1 (used in the library itself)

-#define wxUSE_CHOICEDLG     0
+#define wxUSE_CHOICEDLG     1

 
 // Use colour picker dialog
 //
 
 // Use colour picker dialog
 //


@@ -896,9 +918,15 @@
 // Set to 1 for PCX format support
 #define wxUSE_PCX           0
 
 // Set to 1 for PCX format support
 #define wxUSE_PCX           0
 

+// Set to 1 for IFF format support
+#define wxUSE_IFF           0
+

 // Set to 1 for XPM format support
 #define wxUSE_XPM           1
 
 // Set to 1 for XPM format support
 #define wxUSE_XPM           1
 

+// Set to 1 for MS Icons and Cursors format support
+#define wxUSE_ICO_CUR       1
+

 // Set to 1 to compile in wxPalette class
 #define wxUSE_PALETTE       1
 
 // Set to 1 to compile in wxPalette class
 #define wxUSE_PALETTE       1