]> git.saurik.com Git - wxWidgets.git/blobdiff - src/osx/carbon/combobox.cpp
pass wxIntPtr, not wxUIntPtr, to wxListCtrl::SortItems() callback as it's more compat...
[wxWidgets.git] / src / osx / carbon / combobox.cpp
index 54c70ebca55c6121be9a8e659237094409b96bf5..79564de842a115a100021dd0784117ceb5f717a0 100644 (file)
@@ -57,9 +57,12 @@ public:
         : wxTextCtrl( cb , 1 )
     {
         m_cb = cb;
-        SetTriggerOnSetValue( false );
     }
 
+    void ForwardEnableTextChangedEvents(bool enable)
+    {
+        EnableTextChangedEvents(enable);
+    }
 protected:
     void OnChar( wxKeyEvent& event )
     {
@@ -147,6 +150,7 @@ protected:
 
         event.Skip();
     }
+    
 private:
     wxComboBox *m_cb;
 
@@ -394,6 +398,19 @@ bool wxComboBox::Create(wxWindow *parent,
     return true;
 }
 
+void wxComboBox::EnableTextChangedEvents(bool enable)
+{ 
+    if ( m_text )
+        m_text->ForwardEnableTextChangedEvents(enable);
+}
+
+wxString wxComboBox::DoGetValue() const
+{
+    wxCHECK_MSG( m_text, wxString(), "can't be called for read-only combobox" );
+
+    return m_text->GetValue();
+}
+
 wxString wxComboBox::GetValue() const
 {
     wxString        result;
@@ -652,7 +669,7 @@ bool wxComboBox::CanRedo() const
         return false;
 }
 
-bool wxComboBox::HandleClicked( double timestampsec )
+bool wxComboBox::OSXHandleClicked( double WXUNUSED(timestampsec) )
 {
 /*
     For consistency with other platforms, clicking in the text area does not constitute a selection