From 9ff4b6ccd9c918a4b7b83a6ed263a7d545bb32fb Mon Sep 17 00:00:00 2001
From: Jaakko Salli <jaakko.salli@dnainternet.net>
Date: Thu, 16 Dec 2010 18:07:05 +0000
Subject: [PATCH] Override wxTextEntry::GetSelection(long *from, long *to) in
 wxOwnerDrawnComboBox to resolve virtual method hiding issues

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66386 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/odcombo.h    | 5 +++++
 src/generic/odcombo.cpp | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/include/wx/odcombo.h b/include/wx/odcombo.h
index 9a6b7bf..026720b 100644
--- a/include/wx/odcombo.h
+++ b/include/wx/odcombo.h
@@ -316,6 +316,11 @@ public:
     virtual int FindString(const wxString& s, bool bCase = false) const;
     virtual void Select(int n);
     virtual int GetSelection() const;
+
+    // Override this just to maintain consistency with virtual methods
+    // between classes.
+    virtual void GetSelection(long *from, long *to) const;
+
     virtual void SetSelection(int n) { Select(n); }
 
 
diff --git a/src/generic/odcombo.cpp b/src/generic/odcombo.cpp
index fb9d6b4..d0ca3c1 100644
--- a/src/generic/odcombo.cpp
+++ b/src/generic/odcombo.cpp
@@ -1070,6 +1070,11 @@ int wxOwnerDrawnComboBox::GetSelection() const
     return GetVListBoxComboPopup()->GetSelection();
 }
 
+void wxOwnerDrawnComboBox::GetSelection(long *from, long *to) const
+{
+    return wxComboCtrl::GetSelection(from, to);
+}
+
 int wxOwnerDrawnComboBox::DoInsertItems(const wxArrayStringsAdapter& items,
                                         unsigned int pos,
                                         void **clientData,
-- 
2.7.4