// compatibility settings
// ----------------------------------------------------------------------------
-// This setting determines the compatibility with 2.0 API: set it to 1 to
+// This setting determines the compatibility with 2.4 API: set it to 1 to
// enable it
//
// Default is 0.
//
// Recommended setting: 0 (please update your code instead!)
-#define WXWIN_COMPATIBILITY_2_2 0
+#define WXWIN_COMPATIBILITY_2_4 0
-// This setting determines the compatibility with 2.2 API: set it to 0 to
+// This setting determines the compatibility with 2.6 API: set it to 0 to
// flag all cases of using deprecated functions.
//
// Default is 1 but please try building your code with 0 as the default will
// in the version after it completely.
//
// Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_4 1
+#define WXWIN_COMPATIBILITY_2_6 1
// Set to 0 for accurate dialog units, else 1 to be as per 2.1.16 and before.
// If migrating between versions, your dialogs may seem to shrink.
// Default is 1
//
// Recommended setting: 1 for win32 else 0
-#if defined(__WIN32__)
+#if defined(__WIN32__) || defined(__WATCOMC__)
#define wxUSE_WCHAR_T 1
#else
#define wxUSE_WCHAR_T 0
#define wxUSE_STD_IOSTREAM 0
#endif
+// Support for positional parameters (e.g. %1$d, %2$s ...) in wxVsnprintf.
+// Note that if the system's implementation does not support positional
+// parameters, setting this to 1 forces the use of the wxWidgets implementation
+// of wxVsnprintf. The standard vsnprintf() supports positional parameters on
+// many Unix systems but usually doesn't under Windows.
+//
+// Positional parameters are very useful when translating a program since using
+// them in formatting strings allow translators to correctly reorder the
+// translated sentences.
+//
+// Default is 1
+//
+// Recommended setting: 1 if you want to support multiple languages
+#define wxUSE_PRINTF_POS_PARAMS 0
+
// ----------------------------------------------------------------------------
// non GUI features selection
// ----------------------------------------------------------------------------
//
// Default is 1.
//
-// Recommended setting: 1
+// Recommended setting: 1
#define wxUSE_MEDIACTRL 1
// Use QuickTime
# define wxUSE_XML 0
#endif
+// Use wxWidget's AUI docking system
+//
+// Default is 1
+//
+// Recommended setting: 1
+#define wxUSE_AUI 1
+
// Set to 1 to compile MS Windows XP theme engine support
#define wxUSE_UXTHEME 0
// 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_DATEPICKCTRL 1 // wxDatePickerCtrl
-#define wxUSE_GAUGE 1 // wxGauge
-#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 0 // requires wxButton // currently not supported
-#define wxUSE_TREECTRL 1 // wxTreeCtrl
+#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.
// Recommended setting: 1
#define wxUSE_CHOICEBOOK 1
+// wxTreebook control is similar to wxNotebook but uses wxTreeCtrl instead of
+// the tabs
+//
+// Default is 1.
+//
+// Recommended setting: 1
+#define wxUSE_TREEBOOK 1
+
+// wxToolbook control is similar to wxNotebook but uses wxToolBar instead of
+// tabs
+//
+// Default is 1.
+//
+// Recommended setting: 1
+#define wxUSE_TOOLBOOK 1
+
// wxTabDialog is a generic version of wxNotebook but it is incompatible with
// the new class. It shouldn't be used in new code.
//
// Recommended setting: 0 (use wxNotebook)
#define wxUSE_TAB_DIALOG 0
-// wxGrid class.
+// wxGrid class
+//
+// Default is 1, set to 0 to cut down compilation time and binaries size if you
+// don't use it.
+//
+// Recommended setting: 1
//
-// Default is 1.
#define wxUSE_GRID 1
// wxProperty[Value/Form/List] classes, used by Dialog Editor
#define wxUSE_PROPSHEET 1
+// wxComboCtrl and related classes: combobox with custom popup window and
+// not necessarily a listbox.
+//
+// Default is 1.
+//
+// Recommended setting: 1 but can be safely set to 0 except for wxUniv where it
+// it used by wxComboBox
+#define wxUSE_COMBOCTRL 1
+
+// wxOwnerDrawnComboBox is a custom combobox allowing to paint the combobox
+// items.
+//
+// Default is 1.
+//
+// Recommended setting: 1 but can be safely set to 0
+#define wxUSE_ODCOMBOBOX 1
+
// ----------------------------------------------------------------------------
// Miscellaneous GUI stuff
// ----------------------------------------------------------------------------
#define wxUSE_GLCANVAS 0
#endif
+// wxRichTextCtrl allows editing of styled text.
+//
+// Default is 1.
+//
+// Recommended setting: 1, set to 0 if you want compile a
+// smaller library.
+#define wxUSE_RICHTEXT 1
+
// wxTreeLayout class
#define wxUSE_TREELAYOUT 1
#define wxUSE_WXHTML_HELP 1
// Use resources
-#define wxUSE_RESOURCES 1
+#define wxUSE_RESOURCES 0
// Window layout constraint system
#define wxUSE_CONSTRAINTS 1