X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c29c95fe24973b94fd724db767193171ca7c513d..63415ba9f5331b2b96215f8a570e05623ea6ec42:/include/wx/osx/combobox.h diff --git a/include/wx/osx/combobox.h b/include/wx/osx/combobox.h index 4a31de9135..e814474732 100644 --- a/include/wx/osx/combobox.h +++ b/include/wx/osx/combobox.h @@ -26,12 +26,13 @@ class wxComboWidgetImpl; // Combobox item class WXDLLIMPEXP_CORE wxComboBox : + public wxWindowWithItems< #if wxOSX_USE_CARBON - public wxNavigationEnabled, + wxNavigationEnabled, #else - public wxControl, + wxControl, #endif - public wxComboBoxBase + wxComboBoxBase> { DECLARE_DYNAMIC_CLASS(wxComboBox) @@ -144,8 +145,6 @@ class WXDLLIMPEXP_CORE wxComboBox : virtual bool OSXHandleClicked( double timestampsec ); - wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST - #if wxOSX_USE_COCOA wxComboWidgetImpl* GetComboPeer() const; #endif