Fixed initialisation order warning

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

diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h
index 14f0dd6b8bb7b9d3a4bedc903a2ef4c06421c4a3..bdac8202b24a016d0bf42d8e75a71dc2d653a89d 100644 (file)
--- a/include/wx/univ/setup0.h
+++ b/include/wx/univ/setup0.h
@@ -486,6 +486,15 @@
 // Define this to use wxURL class.
 #define wxUSE_URL 1
 
+// Support for wxVariant class used in several places throughout the library,
+// notably in wxDataViewCtrl API.
+//
+// Default is 1.
+//
+// Recommended setting: 1 unless you want to reduce the library size as much as
+// possible in which case setting this to 0 can gain up to 100KB.
+#define wxUSE_VARIANT 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.
@@ -542,6 +551,28 @@
 #  define wxUSE_XML       0
 #endif
 
+// Use wxWidget's AUI docking system
+//
+// Default is 1
+//
+// Recommended setting: 1
+#define wxUSE_AUI       1
+
+
+// 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.
+//
+// Default is 0
+//
+// Recommended setting: 1
+#ifndef wxUSE_GRAPHICS_CONTEXT
+#define wxUSE_GRAPHICS_CONTEXT 0
+#endif
+
 // Set to 1 to compile MS Windows XP theme engine support
 #define wxUSE_UXTHEME           0
 
@@ -586,32 +617,37 @@
 // Default is 1
 //
 // Recommended setting: 1
-#define wxUSE_BUTTON        1    // wxButton
-#define wxUSE_BMPBUTTON     1    // wxBitmapButton
-#define wxUSE_CALENDARCTRL  1    // wxCalendarCtrl
-#define wxUSE_CHECKBOX      1    // wxCheckBox
-#define wxUSE_CHECKLISTBOX  1    // wxCheckListBox
-#define wxUSE_CHOICE        1    // wxChoice
-#define wxUSE_COMBOBOX      1    // wxComboBox
-#define wxUSE_DATAVIEWCTRL  1    // wxDataViewCtrl
-#define wxUSE_DATEPICKCTRL  1    // wxDatePickerCtrl
-#define wxUSE_GAUGE         1    // wxGauge
-#define wxUSE_HYPERLINKCTRL 1   // wxHyperlinkCtrl
-#define wxUSE_LISTBOX       1    // wxListBox
-#define wxUSE_LISTCTRL      1    // wxListCtrl
-#define wxUSE_RADIOBOX      1    // wxRadioBox
-#define wxUSE_RADIOBTN      1    // wxRadioButton
-#define wxUSE_SCROLLBAR     1    // wxScrollBar
-#define wxUSE_SLIDER        1    // wxSlider
-#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_STATBMP       1    // wxStaticBitmap
-#define wxUSE_TEXTCTRL      1    // wxTextCtrl
-#define wxUSE_TOGGLEBTN     1    // wxToggleButton
-#define wxUSE_TREECTRL      1    // wxTreeCtrl
+#define wxUSE_ANIMATIONCTRL    1    // wxAnimationCtrl
+#define wxUSE_BUTTON           1    // wxButton
+#define wxUSE_BMPBUTTON        1    // wxBitmapButton
+#define wxUSE_CALENDARCTRL     1    // wxCalendarCtrl
+#define wxUSE_CHECKBOX         1    // wxCheckBox
+#define wxUSE_CHECKLISTBOX     1    // wxCheckListBox
+#define wxUSE_CHOICE           1    // wxChoice
+#define wxUSE_COLOURPICKERCTRL 1    // wxColourPickerCtrl
+#define wxUSE_COMBOBOX         1    // wxComboBox
+#define wxUSE_DATAVIEWCTRL     1    // wxDataViewCtrl
+#define wxUSE_DATEPICKCTRL     1    // wxDatePickerCtrl
+#define wxUSE_DIRPICKERCTRL    1   // wxDirPickerCtrl
+#define wxUSE_FILEPICKERCTRL   1  // wxFilePickerCtrl
+#define wxUSE_FONTPICKERCTRL   1  // wxFontPickerCtrl
+#define wxUSE_GAUGE            1    // wxGauge
+#define wxUSE_HYPERLINKCTRL    1   // wxHyperlinkCtrl
+#define wxUSE_LISTBOX          1    // wxListBox
+#define wxUSE_LISTCTRL         1    // wxListCtrl
+#define wxUSE_RADIOBOX         1    // wxRadioBox
+#define wxUSE_RADIOBTN         1    // wxRadioButton
+#define wxUSE_SCROLLBAR        1    // wxScrollBar
+#define wxUSE_SLIDER           1    // wxSlider
+#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_STATBMP          1    // wxStaticBitmap
+#define wxUSE_TEXTCTRL         1    // wxTextCtrl
+#define wxUSE_TOGGLEBTN        1    // wxToggleButton
+#define wxUSE_TREECTRL         1    // wxTreeCtrl
 
 // Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR
 // below either wxStatusBar95 or a generic wxStatusBar will be used.
@@ -716,9 +752,17 @@
 //
 // Default is 1.
 //
-// Recommended setting: 1 but can be safely set to 0
+// Recommended setting: 1 but can be safely set to 0, except where it is
+//                      needed as a base class for generic wxBitmapComboBox.
 #define wxUSE_ODCOMBOBOX 1
 
+// wxBitmapComboBox a combobox that can have images in front of text items.
+//
+// Default is 1.
+//
+// Recommended setting: 1 but can be safely set to 0
+#define wxUSE_BITMAPCOMBOBOX 1
+
 // ----------------------------------------------------------------------------
 // Miscellaneous GUI stuff
 // ----------------------------------------------------------------------------
@@ -882,6 +926,14 @@
 // wizards
 #define wxUSE_WIZARDDLG 1
 
+// Compile in wxAboutBox() function showing the standard "About" dialog.
+//
+// Default is 1
+//
+// Recommended setting: 1 but can be set to 0 to save some space if you don't
+//                      use this function
+#define wxUSE_ABOUTDLG 1
+
 // ----------------------------------------------------------------------------
 // Metafiles support
 // ----------------------------------------------------------------------------