From: Vadim Zeitlin Date: Mon, 8 May 2006 23:46:37 +0000 (+0000) Subject: added wxUSE_COMBOBCONTROL and wxUSE_OWNERDRAWNCOMBOBOX to wx/setup.h files X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/21849f3a8ed2e3ebdc642b349675d1e54095c545 added wxUSE_COMBOBCONTROL and wxUSE_OWNERDRAWNCOMBOBOX to wx/setup.h files git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/mac/setup0.h b/include/wx/mac/setup0.h index 61169e8269..6effe0aa71 100644 --- a/include/wx/mac/setup0.h +++ b/include/wx/mac/setup0.h @@ -674,6 +674,23 @@ // Recommended setting: 1 (it doesn't cost almost anything) #define wxUSE_MINIFRAME 1 +// wxComboControl 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_COMBOCONTROL 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_OWNERDRAWNCOMBOBOX 1 + // ---------------------------------------------------------------------------- // Miscellaneous GUI stuff // ---------------------------------------------------------------------------- diff --git a/include/wx/motif/setup0.h b/include/wx/motif/setup0.h index 4f2bde5aba..910dc40525 100644 --- a/include/wx/motif/setup0.h +++ b/include/wx/motif/setup0.h @@ -673,6 +673,23 @@ // Recommended setting: 1 (it doesn't cost almost anything) #define wxUSE_MINIFRAME 1 +// wxComboControl 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_COMBOCONTROL 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_OWNERDRAWNCOMBOBOX 1 + // ---------------------------------------------------------------------------- // Miscellaneous GUI stuff // ---------------------------------------------------------------------------- diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h index a212bc2446..98b386db20 100644 --- a/include/wx/msw/setup0.h +++ b/include/wx/msw/setup0.h @@ -673,6 +673,23 @@ // Recommended setting: 1 (it doesn't cost almost anything) #define wxUSE_MINIFRAME 1 +// wxComboControl 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_COMBOCONTROL 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_OWNERDRAWNCOMBOBOX 1 + // ---------------------------------------------------------------------------- // Miscellaneous GUI stuff // ---------------------------------------------------------------------------- diff --git a/include/wx/msw/wince/setup.h b/include/wx/msw/wince/setup.h index 4b7ed472de..36b95ab752 100644 --- a/include/wx/msw/wince/setup.h +++ b/include/wx/msw/wince/setup.h @@ -673,6 +673,23 @@ // Recommended setting: 1 (it doesn't cost almost anything) #define wxUSE_MINIFRAME 1 +// wxComboControl 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_COMBOCONTROL 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_OWNERDRAWNCOMBOBOX 1 + // ---------------------------------------------------------------------------- // Miscellaneous GUI stuff // ---------------------------------------------------------------------------- diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h index 524c93c98d..2159cfe9bc 100644 --- a/include/wx/os2/setup0.h +++ b/include/wx/os2/setup0.h @@ -673,6 +673,23 @@ // Recommended setting: 1 (it doesn't cost almost anything) #define wxUSE_MINIFRAME 1 +// wxComboControl 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_COMBOCONTROL 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_OWNERDRAWNCOMBOBOX 1 + // ---------------------------------------------------------------------------- // Miscellaneous GUI stuff // ---------------------------------------------------------------------------- diff --git a/include/wx/palmos/setup0.h b/include/wx/palmos/setup0.h index 0676921c3c..a07313ecec 100644 --- a/include/wx/palmos/setup0.h +++ b/include/wx/palmos/setup0.h @@ -673,6 +673,23 @@ // Recommended setting: 1 (it doesn't cost almost anything) #define wxUSE_MINIFRAME 1 +// wxComboControl 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_COMBOCONTROL 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_OWNERDRAWNCOMBOBOX 1 + // ---------------------------------------------------------------------------- // Miscellaneous GUI stuff // ---------------------------------------------------------------------------- diff --git a/setup.h.in b/setup.h.in index b120b93077..de5a2483a3 100644 --- a/setup.h.in +++ b/setup.h.in @@ -298,6 +298,7 @@ #define wxUSE_CHECKLISTBOX 0 #define wxUSE_CHOICE 0 #define wxUSE_COMBOBOX 0 +#define wxUSE_DATAVIEWCTRL 0 #define wxUSE_DATEPICKCTRL 0 #define wxUSE_GAUGE 0 #define wxUSE_LISTBOX 0 @@ -337,10 +338,12 @@ #define wxUSE_GRID 0 -#define wxUSE_DATAVIEWCTRL 0 - #define wxUSE_MINIFRAME 0 +#define wxUSE_COMBOCONTROL 0 + +#define wxUSE_OWNERDRAWNCOMBOBOX 0 + #define wxUSE_ACCEL 0