diff --git a/include/wx/osx/combobox.h b/include/wx/osx/combobox.h
index cae14068b8..81be73fbb4 100644
--- a/include/wx/osx/combobox.h
+++ b/include/wx/osx/combobox.h
@@ -132,7 +132,9 @@ class WXDLLIMPEXP_CORE wxComboBox : public wxControl, public wxComboBoxBase
     virtual bool CanRedo() const;
 
     virtual wxClientDataType GetClientDataType() const;
-#endif
+
+    virtual wxTextWidgetImpl* GetTextPeer() const;
+#endif // wxOSX_USE_CARBON
 
 
 
diff --git a/include/wx/textentry.h b/include/wx/textentry.h
index 701893bc8f..640d82cf1c 100644
--- a/include/wx/textentry.h
+++ b/include/wx/textentry.h
@@ -159,8 +159,8 @@ public:
         { return DoGetMargins(); }
 
 
-    // events
-    // ------
+    // implementation only
+    // -------------------
 
     // generate the wxEVT_COMMAND_TEXT_UPDATED event for GetEditableWindow(),
     // like SetValue() does and return true if the event was processed
@@ -168,6 +168,21 @@ public:
     // NB: this is public for wxRichTextCtrl use only right now, do not call it
     static bool SendTextUpdatedEvent(wxWindow *win);
 
+    // this function is provided solely for the purpose of forwarding text
+    // change notifications state from one control to another, e.g. it can be
+    // used by a wxComboBox which derives from wxTextEntry if it delegates all
+    // of its methods to another wxTextCtrl
+    void ForwardEnableTextChangedEvents(bool enable)
+    {
+        // it's important to call the functions which update m_eventsBlock here
+        // and not just our own EnableTextChangedEvents() because our state
+        // (i.e. the result of EventsAllowed()) must change as well
+        if ( enable )
+            ResumeTextChangedEvents();
+        else
+            SuppressTextChangedEvents();
+    }
+
 protected:
     // flags for DoSetValue(): common part of SetValue() and ChangeValue() and
     // also used to implement WriteText() in wxMSW
@@ -231,6 +246,7 @@ protected:
             SendTextUpdatedEvent();
     }
 
+
 private:
     // suppress or resume the text changed events generation: don't use these
     // functions directly, use EventsSuppressor class above instead
diff --git a/src/osx/carbon/combobox.cpp b/src/osx/carbon/combobox.cpp
index 2dd7799867..34aba5b850 100644
--- a/src/osx/carbon/combobox.cpp
+++ b/src/osx/carbon/combobox.cpp
@@ -59,10 +59,6 @@ public:
         m_cb = cb;
     }
 
-    void ForwardEnableTextChangedEvents(bool enable)
-    {
-        EnableTextChangedEvents(enable);
-    }
 protected:
     void OnChar( wxKeyEvent& event )
     {