[ 1493802 ] Allow multiple wxComboCtrl::SetPopupControl calls.

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

diff --git a/include/wx/mac/setup0.h b/include/wx/mac/setup0.h
index 6effe0aa71decd8335805c3cfaa8f7ec00d6a8fd..853a33edbe96c3e75496a4e171f24e800bd81e43 100644 (file)
--- a/include/wx/mac/setup0.h
+++ b/include/wx/mac/setup0.h
@@ -674,14 +674,14 @@
 // Recommended setting: 1 (it doesn't cost almost anything)
 #define wxUSE_MINIFRAME 1
 
 // Recommended setting: 1 (it doesn't cost almost anything)
 #define wxUSE_MINIFRAME 1
 

-// wxComboControl and related classes: combobox with custom popup window and
+// 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
 // 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
+#define wxUSE_COMBOCTRL 1

 
 // wxOwnerDrawnComboBox is a custom combobox allowing to paint the combobox
 // items.
 
 // wxOwnerDrawnComboBox is a custom combobox allowing to paint the combobox
 // items.


@@ -689,7 +689,7 @@
 // Default is 1.
 //
 // Recommended setting: 1 but can be safely set to 0
 // Default is 1.
 //
 // Recommended setting: 1 but can be safely set to 0

-#define wxUSE_OWNERDRAWNCOMBOBOX 1
+#define wxUSE_ODCOMBOBOX 1

 
 // ----------------------------------------------------------------------------
 // Miscellaneous GUI stuff
 
 // ----------------------------------------------------------------------------
 // Miscellaneous GUI stuff