From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 6 Apr 2010 18:46:14 +0000 (+0000)
Subject: Remove duplicated GetTextPeer() definitions from derived classes.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/005ac806ead92411ad4810d407df311e4a608302

Remove duplicated GetTextPeer() definitions from derived classes.

GetTextPeer() may be implemented directly in wxTextEntry under OS X, there is
no need to define it (identically) in wxTextCtrl and wxComboBox.

Also just call this method instead of duplicating its code in wxOSX
wxTextCtrl.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63878 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/osx/combobox.h b/include/wx/osx/combobox.h
index bf1b20861b..cae14068b8 100644
--- a/include/wx/osx/combobox.h
+++ b/include/wx/osx/combobox.h
@@ -146,10 +146,6 @@ class WXDLLIMPEXP_CORE wxComboBox : public wxControl, public wxComboBoxBase
     WX_DECLARE_CONTROL_CONTAINER();
 #endif
 
-    // only used by the native Cocoa combobox, but we must define it everywhere
-    // to maintain the wxTextEntry abstraction.
-    virtual wxTextWidgetImpl * GetTextPeer() const;
-
 #if wxOSX_USE_COCOA
     wxComboWidgetImpl* GetComboPeer() const;
 #endif
diff --git a/include/wx/osx/textctrl.h b/include/wx/osx/textctrl.h
index 988340df21..85583505fd 100644
--- a/include/wx/osx/textctrl.h
+++ b/include/wx/osx/textctrl.h
@@ -26,9 +26,6 @@
 #include "wx/control.h"
 #include "wx/textctrl.h"
 
-// forward decl for wxListWidgetImpl implementation type.
-class WXDLLIMPEXP_FWD_CORE wxTextWidgetImpl;
-
 class WXDLLIMPEXP_CORE wxTextCtrl: public wxTextCtrlBase
 {
   DECLARE_DYNAMIC_CLASS(wxTextCtrl)
@@ -142,7 +139,6 @@ public:
     virtual void MacSuperChangedPosition();
     virtual void MacCheckSpelling(bool check);
 
-    virtual wxTextWidgetImpl * GetTextPeer() const;
 protected:
     // common part of all ctors
     void Init();
diff --git a/src/osx/combobox_osx.cpp b/src/osx/combobox_osx.cpp
index 744ad7304a..a69e26cf8b 100644
--- a/src/osx/combobox_osx.cpp
+++ b/src/osx/combobox_osx.cpp
@@ -217,11 +217,6 @@ bool wxComboBox::OSXHandleClicked( double WXUNUSED(timestampsec) )
     return true;
 }
 
-wxTextWidgetImpl* wxComboBox::GetTextPeer() const
-{
-    return dynamic_cast<wxTextWidgetImpl*> (m_peer);
-}
-
 wxComboWidgetImpl* wxComboBox::GetComboPeer() const
 {
     return dynamic_cast<wxComboWidgetImpl*> (m_peer);
diff --git a/src/osx/textctrl_osx.cpp b/src/osx/textctrl_osx.cpp
index 869fcb5b50..4021966024 100644
--- a/src/osx/textctrl_osx.cpp
+++ b/src/osx/textctrl_osx.cpp
@@ -137,11 +137,6 @@ bool wxTextCtrl::Create( wxWindow *parent,
     return true;
 }
 
-wxTextWidgetImpl* wxTextCtrl::GetTextPeer() const
-{
-    return dynamic_cast<wxTextWidgetImpl*> (m_peer);
-}
-
 void wxTextCtrl::MacSuperChangedPosition()
 {
     wxWindow::MacSuperChangedPosition() ;
diff --git a/src/osx/textentry_osx.cpp b/src/osx/textentry_osx.cpp
index 680a4fdcfb..3e2ca4f22d 100644
--- a/src/osx/textentry_osx.cpp
+++ b/src/osx/textentry_osx.cpp
@@ -204,7 +204,9 @@ bool wxTextEntry::CanRedo() const
 
 wxTextWidgetImpl * wxTextEntry::GetTextPeer() const
 {
-    wxFAIL_MSG("You need to implement wxTextWidgetImpl* GetTextPeer() in your wxTextEntry subclass if you want to use the native impls of its methods.");
-    return NULL;
+    wxWindow * const win = const_cast<wxTextEntry *>(this)->GetEditableWindow();
+
+    return win ? dynamic_cast<wxTextWidgetImpl *>(win->GetPeer()) : NULL;
 }
+
 #endif // wxUSE_TEXTCTRL