making virtual lists faster by not sorting items

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

diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp
index 7bac2630c465cd8748c4c63ca68df9b141bd3554..0f0fbdc08a360d22abb0e65c8d334fc0b2c4d17a 100644 (file)
--- a/src/mac/carbon/combobox.cpp
+++ b/src/mac/carbon/combobox.cpp
@@ -1,35 +1,46 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        combobox.cpp
+// Name:        src/mac/carbon/combobox.cpp

 // Purpose:     wxComboBox class
 // Purpose:     wxComboBox class

-// Author:      AUTHOR
+// Author:      Stefan Csomor, Dan "Bud" Keith (composite combobox)

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
+// Copyright:   (c) Stefan Csomor

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "combobox.h"
-#endif
+#include "wx/wxprec.h"
+
+#if wxUSE_COMBOBOX

 
 #include "wx/combobox.h"
 
 #include "wx/combobox.h"

-#include "wx/menu.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/button.h"
+    #include "wx/menu.h"
+    #include "wx/containr.h"
+    #include "wx/toplevel.h"
+#endif
+

 #include "wx/mac/uma.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
+WX_DELEGATE_TO_CONTROL_CONTAINER(wxComboBox, wxControl)
+
+BEGIN_EVENT_TABLE(wxComboBox, wxControl)
+    WX_EVENT_TABLE_CONTROL_CONTAINER(wxComboBox)
+END_EVENT_TABLE()

 
 
 static int nextPopUpMenuId = 1000 ;
 
 
 static int nextPopUpMenuId = 1000 ;

-MenuHandle NewUniqueMenu() 
+
+MenuHandle NewUniqueMenu()

 {
 {

-  MenuHandle handle = NewMenu( nextPopUpMenuId , "\pMenu" ) ;
-  nextPopUpMenuId++ ;
-  return handle ;
+    MenuHandle handle = UMANewMenu(nextPopUpMenuId, wxString(wxT("Menu")), wxFont::GetDefaultEncoding() );
+    nextPopUpMenuId++ ;
+
+    return handle ;

 }
 
 
 }
 
 


@@ -38,8 +49,16 @@ MenuHandle NewUniqueMenu()
 // ----------------------------------------------------------------------------
 
 // the margin between the text control and the choice
 // ----------------------------------------------------------------------------
 
 // the margin between the text control and the choice

+#if TARGET_API_MAC_OSX
+// margin should be bigger on OS X due to blue highlight
+// around text control.
+static const wxCoord MARGIN = 4;
+// this is the border a focus rect on OSX is needing
+static const int    TEXTFOCUSBORDER = 3 ;
+#else

 static const wxCoord MARGIN = 2;
 static const wxCoord MARGIN = 2;

-static const int    POPUPWIDTH = 18;
+static const int    TEXTFOCUSBORDER = 0 ;
+#endif

 static const int    POPUPHEIGHT = 23;
 
 
 static const int    POPUPHEIGHT = 23;
 
 


@@ -51,21 +70,89 @@ class wxComboBoxText : public wxTextCtrl
 {
 public:
     wxComboBoxText( wxComboBox * cb )
 {
 public:
     wxComboBoxText( wxComboBox * cb )

-        : wxTextCtrl( cb->GetParent(), 1 )
+        : wxTextCtrl( cb , 1 )

     {
         m_cb = cb;
     {
         m_cb = cb;

+        SetTriggerOnSetValue( false );

     }
 
 protected:
     }
 
 protected:

-    void OnTextChange( wxCommandEvent& event )
+    void OnChar( wxKeyEvent& event )

     {
     {

-        wxString    s = GetValue();
-            
-        m_cb->DelegateTextChanged( s );
+        // Allows processing the tab key to go to the next control
+        if (event.GetKeyCode() == WXK_TAB)
+        {
+            wxNavigationKeyEvent NavEvent;
+            NavEvent.SetEventObject(this);
+            NavEvent.SetDirection(true);
+            NavEvent.SetWindowChange(false);
+
+            // Get the parent of the combo and have it process the navigation?
+            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());
+            event.SetString( GetValue() );
+            event.SetInt( m_cb->GetSelection() );
+            event.SetEventObject( m_cb );
+
+            // This will invoke the dialog default action,
+            // such as the clicking the default button.
+            if (!m_cb->GetEventHandler()->ProcessEvent( event ))
+            {
+                wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow);
+                if ( tlw && tlw->GetDefaultItem() )
+                {
+                    wxButton *def = wxDynamicCast(tlw->GetDefaultItem(), wxButton);
+                    if ( def && def->IsEnabled() )
+                    {
+                        wxCommandEvent event( wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
+                        event.SetEventObject(def);
+                        def->Command(event);
+                   }
+                }
+
+                return;
+            }
+        }

 
         event.Skip();
     }
 
 
         event.Skip();
     }
 

+    void OnKeyUp( wxKeyEvent& 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;
 


@@ -73,48 +160,95 @@ private:
 };
 
 BEGIN_EVENT_TABLE(wxComboBoxText, wxTextCtrl)
 };
 
 BEGIN_EVENT_TABLE(wxComboBoxText, wxTextCtrl)

-    EVT_TEXT(-1, wxComboBoxText::OnTextChange)
+    EVT_KEY_DOWN(wxComboBoxText::OnKeyDown)
+    EVT_CHAR(wxComboBoxText::OnChar)
+    EVT_KEY_UP(wxComboBoxText::OnKeyUp)
+    EVT_TEXT(wxID_ANY, wxComboBoxText::OnText)

 END_EVENT_TABLE()
 
 class wxComboBoxChoice : public wxChoice
 {
 public:
 END_EVENT_TABLE()
 
 class wxComboBoxChoice : public wxChoice
 {
 public:

-    wxComboBoxChoice(wxComboBox *cb, int style)
-        : wxChoice( cb->GetParent(), 1 )
+    wxComboBoxChoice( wxComboBox *cb, int style )
+        : wxChoice( cb , 1 , wxDefaultPosition , wxDefaultSize , 0 , NULL , style & (wxCB_SORT) )

     {
         m_cb = cb;
     }
 
     {
         m_cb = cb;
     }
 

+    int GetPopupWidth() const
+    {
+        switch ( GetWindowVariant() )
+        {
+            case wxWINDOW_VARIANT_NORMAL :
+            case wxWINDOW_VARIANT_LARGE :
+                return 24 ;
+
+            default :
+                return 21 ;
+        }
+    }
+

 protected:
     void OnChoice( wxCommandEvent& e )
     {
         wxString    s = e.GetString();
 
         m_cb->DelegateChoice( s );
 protected:
     void OnChoice( wxCommandEvent& e )
     {
         wxString    s = e.GetString();
 
         m_cb->DelegateChoice( s );

+        wxCommandEvent event2(wxEVT_COMMAND_COMBOBOX_SELECTED, m_cb->GetId() );
+        event2.SetInt(m_cb->GetSelection());
+        event2.SetEventObject(m_cb);
+        event2.SetString(m_cb->GetStringSelection());
+        m_cb->ProcessCommand(event2);
+
+        // For consistency with MSW and GTK, also send a text updated event
+        // After all, the text is updated when a selection is made
+        wxCommandEvent TextEvent( wxEVT_COMMAND_TEXT_UPDATED, m_cb->GetId() );
+        TextEvent.SetString( m_cb->GetStringSelection() );
+        TextEvent.SetEventObject( m_cb );
+        m_cb->ProcessCommand( TextEvent );
+    }
+
+    virtual wxSize DoGetBestSize() const
+    {
+        wxSize sz = wxChoice::DoGetBestSize() ;
+        if (! m_cb->HasFlag(wxCB_READONLY) )
+            sz.x = GetPopupWidth() ;
+
+        return sz ;

     }
 
 private:
     wxComboBox *m_cb;
 
     }
 
 private:
     wxComboBox *m_cb;
 

+    friend class wxComboBox;
+

     DECLARE_EVENT_TABLE()
 };
 
 BEGIN_EVENT_TABLE(wxComboBoxChoice, wxChoice)
     DECLARE_EVENT_TABLE()
 };
 
 BEGIN_EVENT_TABLE(wxComboBoxChoice, wxChoice)

-    EVT_CHOICE(-1, wxComboBoxChoice::OnChoice)
+    EVT_CHOICE(wxID_ANY, wxComboBoxChoice::OnChoice)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-
-
-

 wxComboBox::~wxComboBox()
 {
 wxComboBox::~wxComboBox()
 {

-   // delete the controls now, don't leave them alive even though they woudl
+    // delete client objects
+    FreeData();
+
+    // delete the controls now, don't leave them alive even though they would

     // still be eventually deleted by our parent - but it will be too late, the
     // user code expects them to be gone now
     // still be eventually deleted by our parent - but it will be too late, the
     // user code expects them to be gone now

-    delete m_text;
-    delete m_choice;
-}
+    if (m_text != NULL)
+    {
+        delete m_text;
+        m_text = NULL;
+    }

 
 

+    if (m_choice != NULL)
+    {
+        delete m_choice;
+        m_choice = NULL;
+    }
+}

 
 // ----------------------------------------------------------------------------
 // geometry
 
 // ----------------------------------------------------------------------------
 // geometry


@@ -122,36 +256,49 @@ wxComboBox::~wxComboBox()
 
 wxSize wxComboBox::DoGetBestSize() const
 {
 
 wxSize wxComboBox::DoGetBestSize() const
 {

+    if (!m_choice && !m_text)
+        return GetSize();
+

     wxSize size = m_choice->GetBestSize();
     wxSize size = m_choice->GetBestSize();

-    
-    if ( m_text != 0 )
+
+    if ( m_text != NULL )

     {
         wxSize  sizeText = m_text->GetBestSize();
     {
         wxSize  sizeText = m_text->GetBestSize();

-        
-        size.x = POPUPWIDTH + sizeText.x + MARGIN;
+        if (sizeText.y > size.y)
+            size.y = sizeText.y;
+
+        size.x = m_choice->GetPopupWidth() + sizeText.x + MARGIN;
+        size.x += TEXTFOCUSBORDER ;
+        size.y += 2 * TEXTFOCUSBORDER ;
+    }
+    else
+    {
+        // clipping is too tight
+        size.y += 1 ;

     }
 
     return size;
 }
 
     }
 
     return size;
 }
 

-void wxComboBox::DoMoveWindow(int x, int y, int width, int height) {
-    height = POPUPHEIGHT;
-    
-    wxControl::DoMoveWindow(x, y, width, height);
+void wxComboBox::DoMoveWindow(int x, int y, int width, int height)
+{
+    wxControl::DoMoveWindow( x, y, width , height );

 
 

-    if ( m_text == 0 )
+    if ( m_text == NULL )

     {
     {

-        m_choice->SetSize(x, y, width, -1);
+        // we might not be fully constructed yet, therefore watch out...
+        if ( m_choice )
+            m_choice->SetSize(0, 0 , width, -1);

     }
     else
     {
     }
     else
     {

-        wxCoord wText = width - POPUPWIDTH;
-        m_text->SetSize(x, y, wText, height);
-        m_choice->SetSize(x + wText + MARGIN, y, POPUPWIDTH, -1);
-    }    
-}
-
+        wxCoord wText = width - m_choice->GetPopupWidth() - MARGIN;
+        m_text->SetSize(TEXTFOCUSBORDER, TEXTFOCUSBORDER, wText, -1);

 
 

+        // put it at an inset of 1 to have outer area shadows drawn as well
+        m_choice->SetSize(TEXTFOCUSBORDER + wText + MARGIN - 1 , TEXTFOCUSBORDER, m_choice->GetPopupWidth() , -1);
+    }
+}

 
 // ----------------------------------------------------------------------------
 // operations forwarded to the subcontrols
 
 // ----------------------------------------------------------------------------
 // operations forwarded to the subcontrols


@@ -160,167 +307,160 @@ void wxComboBox::DoMoveWindow(int x, int y, int width, int height) {
 bool wxComboBox::Enable(bool enable)
 {
     if ( !wxControl::Enable(enable) )
 bool wxComboBox::Enable(bool enable)
 {
     if ( !wxControl::Enable(enable) )

-        return FALSE;
+        return false;

 
 

-    m_choice->Enable(enable);
-    
-    if ( m_text != 0 )
-    {
+    if (m_text)

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

-    }

 
 

-    return TRUE;
+    return true;

 }
 
 bool wxComboBox::Show(bool show)
 {
     if ( !wxControl::Show(show) )
 }
 
 bool wxComboBox::Show(bool show)
 {
     if ( !wxControl::Show(show) )

-        return FALSE;
-
-    // under GTK Show() is called the first time before we are fully
-    // constructed
-    if ( m_choice )
-    {
-        m_choice->Show(show);
-        if ( m_text != 0 )
-        {
-            m_text->Show(show);
-        }
-    }
+        return false;

 
 

-    return TRUE;
+    return true;

 }
 
 }
 

- void wxComboBox::SetFocus()
- {
-    m_text->SetFocus();
- }
-
-
-void wxComboBox::DelegateTextChanged( const wxString& value ) {
+void wxComboBox::DelegateTextChanged( const wxString& value )
+{
+    SetStringSelection( value );

 }
 
 }
 

-

 void wxComboBox::DelegateChoice( const wxString& value )
 {
     SetStringSelection( value );
 }
 
 void wxComboBox::DelegateChoice( const wxString& value )
 {
     SetStringSelection( value );
 }
 

+void wxComboBox::Init()
+{
+    m_container.SetContainerWindow(this);
+}

 
 

-bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
-           const wxString& value,
-           const wxPoint& pos,
-           const wxSize& size,
-           int n, const wxString choices[],
-           long style,
-           const wxValidator& validator,
-           const wxString& name)
+bool wxComboBox::Create(wxWindow *parent,
+    wxWindowID id,
+    const wxString& value,
+    const wxPoint& pos,
+    const wxSize& size,
+    const wxArrayString& choices,
+    long style,
+    const wxValidator& validator,
+    const wxString& name)

 {
 {

+    wxCArrayString chs( choices );

 
 

-    Rect bounds ;
-    Str255 title ;
+    return Create( parent, id, value, pos, size, chs.GetCount(),
+                   chs.GetStrings(), style, validator, name );
+}

 
 

-    if ( !wxControl::Create(parent, id, pos, size, style,
-                            wxDefaultValidator, name) )
+bool wxComboBox::Create(wxWindow *parent,
+    wxWindowID id,
+    const wxString& value,
+    const wxPoint& pos,
+    const wxSize& size,
+    int n,
+    const wxString choices[],
+    long style,
+    const wxValidator& validator,
+    const wxString& name)
+{
+    if ( !wxControl::Create(parent, id, wxDefaultPosition, wxDefaultSize, style ,
+                            validator, name) )

     {
     {

-        return FALSE;
+        return false;

     }
 
     }
 

-    m_choice = new wxComboBoxChoice(this, style);
-
+    m_choice = new wxComboBoxChoice(this, style );

     wxSize csize = size;
     if ( style & wxCB_READONLY )
     {
     wxSize csize = size;
     if ( style & wxCB_READONLY )
     {

-        m_text = 0;
+        m_text = NULL;

     }
     else
     {
         m_text = new wxComboBoxText(this);
     }
     else
     {
         m_text = new wxComboBoxText(this);

-        if ( size.y == -1 ) {
-          csize.y = m_text->GetSize().y ;
+        if ( size.y == -1 )
+        {
+            csize.y = m_text->GetSize().y ;
+            csize.y += 2 * TEXTFOCUSBORDER ;

         }
     }
         }
     }

-    
+

     DoSetSize(pos.x, pos.y, csize.x, csize.y);
     DoSetSize(pos.x, pos.y, csize.x, csize.y);

+

     for ( int i = 0 ; i < n ; i++ )
     {
         m_choice->DoAppend( choices[ i ] );
     }
 
     for ( int i = 0 ; i < n ; i++ )
     {
         m_choice->DoAppend( choices[ i ] );
     }
 

-    // have to disable this window to avoid interfering it with message
-    // processing to the text and the button... but pretend it is enabled to
-    // make IsEnabled() return TRUE
-    wxControl::Enable(FALSE); // don't use non virtual Disable() here!
-    m_isEnabled = TRUE;
-
-    // we don't even need to show this window itself - and not doing it avoids
-    // that it overwrites the text control
-    wxControl::Show(FALSE);
+    // Needed because it is a wxControlWithItems
+    SetBestSize(size);
+    SetStringSelection(value);

 
 

-    return TRUE;
+    return true;

 }
 
 wxString wxComboBox::GetValue() const
 {
     wxString        result;
 }
 
 wxString wxComboBox::GetValue() const
 {
     wxString        result;

-    
-    if ( m_text == 0 )
-    {
+
+    if ( m_text == NULL )

         result = m_choice->GetString( m_choice->GetSelection() );
         result = m_choice->GetString( m_choice->GetSelection() );

-    }

     else
     else

-    {

         result = m_text->GetValue();
         result = m_text->GetValue();

-    }

 
     return result;
 }
 
 
     return result;
 }
 

+unsigned int wxComboBox::GetCount() const
+{
+    return m_choice->GetCount() ;
+}
+

 void wxComboBox::SetValue(const wxString& value)
 {
 void wxComboBox::SetValue(const wxString& value)
 {

-    SetStringSelection( value ) ;
+    if ( HasFlag(wxCB_READONLY) )
+        SetStringSelection( value ) ;
+    else
+        m_text->SetValue( value );

 }
 
 // Clipboard operations
 }
 
 // Clipboard operations

+

 void wxComboBox::Copy()
 {
 void wxComboBox::Copy()
 {

-    if ( m_text != 0 )
-    {
+    if ( m_text != NULL )

         m_text->Copy();
         m_text->Copy();

-    }

 }
 
 void wxComboBox::Cut()
 {
 }
 
 void wxComboBox::Cut()
 {

-    if ( m_text != 0 )
-    {
+    if ( m_text != NULL )

         m_text->Cut();
         m_text->Cut();

-    }

 }
 
 void wxComboBox::Paste()
 {
 }
 
 void wxComboBox::Paste()
 {

-    if ( m_text != 0 )
-    {
+    if ( m_text != NULL )

         m_text->Paste();
         m_text->Paste();

-    }

 }
 
 void wxComboBox::SetEditable(bool editable)
 {
 }
 
 void wxComboBox::SetEditable(bool editable)
 {

-    if ( ( m_text == 0 ) && editable )
+    if ( ( m_text == NULL ) && editable )

     {
         m_text = new wxComboBoxText( this );
     }
     {
         m_text = new wxComboBoxText( this );
     }

-    else if ( ( m_text != 0 ) && !editable )
+    else if ( ( m_text != NULL ) && !editable )

     {
         delete m_text;
     {
         delete m_text;

-        m_text = 0;
+        m_text = NULL;

     }
 
     int currentX, currentY;
     GetPosition( &currentX, &currentY );
     }
 
     int currentX, currentY;
     GetPosition( &currentX, &currentY );

-    
+

     int currentW, currentH;
     GetSize( &currentW, &currentH );
 
     int currentW, currentH;
     GetSize( &currentW, &currentH );
 


@@ -343,7 +483,7 @@ long wxComboBox::GetInsertionPoint() const
     return 0;
 }
 
     return 0;
 }
 

-long wxComboBox::GetLastPosition() const
+wxTextPos wxComboBox::GetLastPosition() const

 {
     // TODO
     return 0;
 {
     // TODO
     return 0;


@@ -364,18 +504,59 @@ void wxComboBox::SetSelection(long from, long to)
     // TODO
 }
 
     // TODO
 }
 

-void wxComboBox::Append(const wxString& item)
+int wxComboBox::DoAppend(const wxString& item)

 {
 {

-    m_choice->DoAppend( item );
+    return m_choice->DoAppend( item ) ;
+}
+
+int wxComboBox::DoInsert(const wxString& item, unsigned int pos)
+{
+    return m_choice->DoInsert( item , pos ) ;
+}
+
+void wxComboBox::DoSetItemClientData(unsigned int n, void* clientData)
+{
+    return m_choice->DoSetItemClientData( n , clientData ) ;
+}
+
+void* wxComboBox::DoGetItemClientData(unsigned int n) const
+{
+    return m_choice->DoGetItemClientData( n ) ;
+}
+
+void wxComboBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData)
+{
+    return m_choice->DoSetItemClientObject(n, clientData);
+}
+
+wxClientData* wxComboBox::DoGetItemClientObject(unsigned int n) const
+{
+    return m_choice->DoGetItemClientObject( n ) ;
+}
+
+void wxComboBox::FreeData()
+{
+    if ( HasClientObjectData() )
+    {
+        unsigned int count = GetCount();
+        for ( unsigned int n = 0; n < count; n++ )
+        {
+            SetClientObject( n, NULL );
+        }
+    }

 }
 
 }
 

-void wxComboBox::Delete(int n)
+void wxComboBox::Delete(unsigned int n)

 {
 {

+    // force client object deletion
+    if( HasClientObjectData() )
+        SetClientObject( n, NULL );

     m_choice->Delete( n );
 }
 
 void wxComboBox::Clear()
 {
     m_choice->Delete( n );
 }
 
 void wxComboBox::Clear()
 {

+    FreeData();

     m_choice->Clear();
 }
 
     m_choice->Clear();
 }
 


@@ -387,50 +568,110 @@ int wxComboBox::GetSelection() const
 void wxComboBox::SetSelection(int n)
 {
     m_choice->SetSelection( n );
 void wxComboBox::SetSelection(int n)
 {
     m_choice->SetSelection( n );

-    
-    if ( m_text != 0 )
-    {
-        m_text->SetValue( GetString( n ) );
-    }
+
+    if ( m_text != NULL )
+        m_text->SetValue(GetString(n));

 }
 
 }
 

-int wxComboBox::FindString(const wxString& s) const
+int wxComboBox::FindString(const wxString& s, bool bCase) const

 {
 {

-    return m_choice->FindString( s );
+    return m_choice->FindString( s, bCase );

 }
 
 }
 

-wxString wxComboBox::GetString(int n) const
+wxString wxComboBox::GetString(unsigned int n) const

 {
     return m_choice->GetString( n );
 }
 
 wxString wxComboBox::GetStringSelection() const
 {
 {
     return m_choice->GetString( n );
 }
 
 wxString wxComboBox::GetStringSelection() const
 {

-    int sel = GetSelection ();
-    if (sel > -1)
-        return wxString(this->GetString (sel));
+    int sel = GetSelection();
+    if (sel != wxNOT_FOUND)
+        return wxString(this->GetString((unsigned int)sel));

     else
     else

-        return wxString("");
+        return wxEmptyString;

 }
 
 }
 

-bool wxComboBox::SetStringSelection(const wxString& sel)
+void wxComboBox::SetString(unsigned int n, const wxString& s)

 {
 {

-    int s = FindString (sel);
-    if (s > -1)
-        {
-            SetSelection (s);
-            return TRUE;
-        }
+    m_choice->SetString( n , s );
+}
+
+bool wxComboBox::IsEditable() const
+{
+    return m_text != NULL && !HasFlag(wxCB_READONLY);
+}
+
+void wxComboBox::Undo()
+{
+    if (m_text != NULL)
+        m_text->Undo();
+}
+
+void wxComboBox::Redo()
+{
+    if (m_text != NULL)
+        m_text->Redo();
+}
+
+void wxComboBox::SelectAll()
+{
+    if (m_text != NULL)
+        m_text->SelectAll();
+}
+
+bool wxComboBox::CanCopy() const
+{
+    if (m_text != NULL)
+        return m_text->CanCopy();
+    else
+        return false;
+}
+
+bool wxComboBox::CanCut() const
+{
+    if (m_text != NULL)
+        return m_text->CanCut();
+    else
+        return false;
+}
+
+bool wxComboBox::CanPaste() const
+{
+    if (m_text != NULL)
+        return m_text->CanPaste();

     else
     else

-        return FALSE;
+        return false;

 }
 
 }
 

-void wxComboBox::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 
+bool wxComboBox::CanUndo() const

 {
 {

+    if (m_text != NULL)
+        return m_text->CanUndo();
+    else
+        return false;
+}
+
+bool wxComboBox::CanRedo() const
+{
+    if (m_text != NULL)
+        return m_text->CanRedo();
+    else
+        return false;
+}
+
+wxInt32 wxComboBox::MacControlHit( WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) )
+{
+/*
+    For consistency with other platforms, clicking in the text area does not constitute a selection

     wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId );
     event.SetInt(GetSelection());
     event.SetEventObject(this);
     event.SetString(GetStringSelection());
     ProcessCommand(event);
     wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId );
     event.SetInt(GetSelection());
     event.SetEventObject(this);
     event.SetString(GetStringSelection());
     ProcessCommand(event);

+*/
+
+    return noErr ;

 }
 
 }
 

+#endif // wxUSE_COMBOBOX