otherwise we always fall back to blitting, even if we can provide better results

[wxWidgets.git] / src / mac / carbon / combobox.cpp

diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp
index 2b758e3fb02e4454d2b20550cc4b47f3da788ecc..40caccafc811508aa3f097b668bc2d71ea389a9b 100644 (file)
--- a/src/mac/carbon/combobox.cpp
+++ b/src/mac/carbon/combobox.cpp
@@ -9,10 +9,14 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "combobox.h"
 #endif
 
+#include "wx/wxprec.h"
+
+#if wxUSE_COMBOBOX
+
 #include "wx/combobox.h"
 #include "wx/button.h"
 #include "wx/menu.h"
@@ -80,6 +84,14 @@ protected:
             if (m_cb->GetParent()->GetEventHandler()->ProcessEvent(NavEvent))
                     return;
         }
+
+        // send the event to the combobox class in case the user has bound EVT_CHAR
+        wxKeyEvent kevt(event);
+        kevt.SetEventObject(m_cb);
+        if (m_cb->GetEventHandler()->ProcessEvent(kevt))
+            // If the event was handled and not skipped then we're done
+            return;
+        
         if ( event.GetKeyCode() == WXK_RETURN )
         {
             wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_cb->GetId());
@@ -115,18 +127,30 @@ protected:
         event.Skip();
     }
 
-    // Use the KeyUp as a naive approximation for TEXT_UPDATED, even though it is somewhat delayed
-    // but this is less complicated than dealing with idle-ness, and is much better than nothing
     void OnKeyUp( wxKeyEvent& event )
     {
-        if ( event.GetKeyCode() != WXK_RETURN )
-        {
-            wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_cb->GetId());
-            event.SetString( GetValue() );
-            event.SetEventObject( m_cb );
-            m_cb->GetEventHandler()->ProcessEvent(event);
-        }
+        event.SetEventObject(m_cb);
+        event.SetId(m_cb->GetId());
+        if (! m_cb->GetEventHandler()->ProcessEvent(event))
+            event.Skip();
     }
+
+    void OnKeyDown( wxKeyEvent& event )
+    {
+        event.SetEventObject(m_cb);
+        event.SetId(m_cb->GetId());
+        if (! m_cb->GetEventHandler()->ProcessEvent(event))
+            event.Skip();
+    }
+    
+    void OnText( wxCommandEvent& event )
+    {
+        event.SetEventObject(m_cb);
+        event.SetId(m_cb->GetId());
+        if (! m_cb->GetEventHandler()->ProcessEvent(event))
+            event.Skip();
+    }        
+
 private:
     wxComboBox *m_cb;
 
@@ -134,15 +158,17 @@ private:
 };
 
 BEGIN_EVENT_TABLE(wxComboBoxText, wxTextCtrl)
-    EVT_CHAR( wxComboBoxText::OnChar)
-    EVT_KEY_UP( wxComboBoxText::OnKeyUp)
+    EVT_KEY_DOWN( wxComboBoxText::OnKeyDown)
+    EVT_CHAR(     wxComboBoxText::OnChar)
+    EVT_KEY_UP(   wxComboBoxText::OnKeyUp)
+    EVT_TEXT( -1, wxComboBoxText::OnText)
 END_EVENT_TABLE()
 
 class wxComboBoxChoice : public wxChoice
 {
 public:
     wxComboBoxChoice(wxComboBox *cb, int style)
-        : wxChoice( cb , 1 )
+        : wxChoice( cb , 1 , wxDefaultPosition , wxDefaultSize , 0 , NULL , style & (wxCB_SORT) )
     {
         m_cb = cb;
     }
@@ -328,7 +354,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
            const wxString& name)
 {
     if ( !wxControl::Create(parent, id, wxDefaultPosition, wxDefaultSize, style ,
-                            wxDefaultValidator, name) )
+                            validator, name) )
     {
         return false;
     }
@@ -357,7 +383,8 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
     }
 
     SetBestSize(size);   // Needed because it is a wxControlWithItems
-
+    SetStringSelection(value);
+    
     return true;
 }
 
@@ -563,18 +590,6 @@ wxString wxComboBox::GetStringSelection() const
         return wxEmptyString;
 }
 
-bool wxComboBox::SetStringSelection(const wxString& sel)
-{
-    int s = FindString (sel);
-    if (s > -1)
-        {
-            SetSelection (s);
-            return true;
-        }
-    else
-        return false;
-}
-
 void wxComboBox::SetString(int n, const wxString& s)
 {
     m_choice->SetString( n , s ) ;
@@ -654,3 +669,4 @@ wxInt32 wxComboBox::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTR
     return noErr ;
 }
 
+#endif