respect styles during creation as well

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

diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp
index 7e6da680cf93c366b134af6a71f7d5c1b0908c6f..0241b689ace1bc06aea045b5179e7d4ab86453ec 100644 (file)
--- a/src/mac/carbon/combobox.cpp
+++ b/src/mac/carbon/combobox.cpp
@@ -15,14 +15,14 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

+#if wxUSE_COMBOBOX
+

 #include "wx/combobox.h"
 #include "wx/button.h"
 #include "wx/menu.h"
 #include "wx/mac/uma.h"
 
 #include "wx/combobox.h"
 #include "wx/button.h"
 #include "wx/menu.h"
 #include "wx/mac/uma.h"
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)

-#endif

 
 // composite combobox implementation by Dan "Bud" Keith bud@otsys.com
 
 
 // composite combobox implementation by Dan "Bud" Keith bud@otsys.com
 


@@ -82,6 +82,14 @@ protected:
             if (m_cb->GetParent()->GetEventHandler()->ProcessEvent(NavEvent))
                     return;
         }
             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());
         if ( event.GetKeyCode() == WXK_RETURN )
         {
             wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_cb->GetId());


@@ -117,18 +125,30 @@ protected:
         event.Skip();
     }
 
         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 )
     {
     void OnKeyUp( wxKeyEvent& event )
     {

-        if ( event.GetKeyCode() != WXK_RETURN && event.GetKeyCode() != WXK_TAB )
-        {
-            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;
 
 private:
     wxComboBox *m_cb;
 


@@ -136,15 +156,17 @@ private:
 };
 
 BEGIN_EVENT_TABLE(wxComboBoxText, wxTextCtrl)
 };
 
 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)
 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;
     }
     {
         m_cb = cb;
     }


@@ -273,6 +295,9 @@ bool wxComboBox::Enable(bool enable)
     if ( !wxControl::Enable(enable) )
         return false;
 
     if ( !wxControl::Enable(enable) )
         return false;
 

+    if (m_text)
+        m_text->Enable(enable);
+

     return true;
 }
 
     return true;
 }
 


@@ -330,7 +355,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
            const wxString& name)
 {
     if ( !wxControl::Create(parent, id, wxDefaultPosition, wxDefaultSize, style ,
            const wxString& name)
 {
     if ( !wxControl::Create(parent, id, wxDefaultPosition, wxDefaultSize, style ,

-                            wxDefaultValidator, name) )
+                            validator, name) )

     {
         return false;
     }
     {
         return false;
     }


@@ -359,7 +384,8 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
     }
 
     SetBestSize(size);   // Needed because it is a wxControlWithItems
     }
 
     SetBestSize(size);   // Needed because it is a wxControlWithItems

-
+    SetStringSelection(value);
+    

     return true;
 }
 
     return true;
 }
 


@@ -565,18 +591,6 @@ wxString wxComboBox::GetStringSelection() const
         return wxEmptyString;
 }
 
         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 ) ;
 void wxComboBox::SetString(int n, const wxString& s)
 {
     m_choice->SetString( n , s ) ;


@@ -656,3 +670,4 @@ wxInt32 wxComboBox::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTR
     return noErr ;
 }
 
     return noErr ;
 }
 

+#endif