From da76d8c2db24252503e471f6e4a38363d6f58b4e Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Fri, 13 Feb 2009 16:06:13 +0000 Subject: [PATCH] porting back support for GetSelection(from,to) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@58883 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/mac/carbon/combobox.h | 5 +++++ src/mac/carbon/combobox.cpp | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/include/wx/mac/carbon/combobox.h b/include/wx/mac/carbon/combobox.h index 446b4b14a5..ad5f11b196 100644 --- a/include/wx/mac/carbon/combobox.h +++ b/include/wx/mac/carbon/combobox.h @@ -103,6 +103,7 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase virtual void Copy(); virtual void Cut(); virtual void Paste(); + virtual void SetInsertionPoint(long pos); virtual void SetInsertionPointEnd(); virtual long GetInsertionPoint() const; @@ -113,6 +114,10 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase virtual void SetEditable(bool editable); virtual bool IsEditable() const; +#if wxABI_VERSION >= 20810 + void GetSelection( long* from, long* to ) const; +#endif + virtual unsigned int GetCount() const; virtual void Undo(); diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp index 9b7e8a1de2..f6d9ee474c 100644 --- a/src/mac/carbon/combobox.cpp +++ b/src/mac/carbon/combobox.cpp @@ -523,6 +523,12 @@ void wxComboBox::SetSelection(long from, long to) m_text->SetSelection(from,to); } +void wxComboBox::GetSelection(long *from, long* to) const +{ + if ( m_text ) + m_text->GetSelection(from,to); +} + int wxComboBox::DoAppend(const wxString& item) { return m_choice->DoAppend( item ) ;