X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/11e62fe658531aaa2891351f19bd0a4c076717ae..5dafb071ba85e7329aa4a0ac176f3ec8e13e55dc:/src/mac/carbon/combobox.cpp?ds=sidebyside

diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp
index d1cc089a88..f2c79697b6 100644
--- a/src/mac/carbon/combobox.cpp
+++ b/src/mac/carbon/combobox.cpp
@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/mac/carbon/combobox.cpp
 // Purpose:     wxComboBox class
-// Author:      Stefan Csomor
+// Author:      Stefan Csomor, Dan "Bud" Keith (composite combobox)
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
@@ -14,21 +14,33 @@
 #if wxUSE_COMBOBOX
 
 #include "wx/combobox.h"
-#include "wx/button.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"
 
 IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
 
-// 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 ;
+
 MenuHandle NewUniqueMenu()
 {
-  MenuHandle handle = NewMenu( nextPopUpMenuId , "\pMenu" ) ;
-  nextPopUpMenuId++ ;
-  return handle ;
+    MenuHandle handle = UMANewMenu(nextPopUpMenuId, wxString(wxT("Menu")), wxFont::GetDefaultEncoding() );
+    nextPopUpMenuId++ ;
+
+    return handle ;
 }
 
 
@@ -47,7 +59,6 @@ static const int    TEXTFOCUSBORDER = 3 ;
 static const wxCoord MARGIN = 2;
 static const int    TEXTFOCUSBORDER = 0 ;
 #endif
-static const int    POPUPHEIGHT = 23;
 
 
 // ----------------------------------------------------------------------------
@@ -61,6 +72,7 @@ public:
         : wxTextCtrl( cb , 1 )
     {
         m_cb = cb;
+        SetTriggerOnSetValue( false );
     }
 
 protected:
@@ -93,25 +105,20 @@ protected:
             event.SetInt( m_cb->GetSelection() );
             event.SetEventObject( m_cb );
 
-            // This will invoke the dialog default action, such
-            // as the clicking the default button.
-
+            // This will invoke the dialog default action,
+            // such as the clicking the default button.
             if (!m_cb->GetEventHandler()->ProcessEvent( event ))
             {
-                wxWindow *parent = GetParent();
-                while( parent && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL ) {
-                    parent = parent->GetParent() ;
-                }
-                if ( parent && parent->GetDefaultItem() )
+                wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow);
+                if ( tlw && tlw->GetDefaultItem() )
                 {
-                    wxButton *def = wxDynamicCast(parent->GetDefaultItem(),
-                                                          wxButton);
+                    wxButton *def = wxDynamicCast(tlw->GetDefaultItem(), wxButton);
                     if ( def && def->IsEnabled() )
                     {
-                        wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
+                        wxCommandEvent event( wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
                         event.SetEventObject(def);
                         def->Command(event);
-                   }
+                    }
                 }
 
                 return;
@@ -152,20 +159,21 @@ private:
 };
 
 BEGIN_EVENT_TABLE(wxComboBoxText, wxTextCtrl)
-    EVT_KEY_DOWN( wxComboBoxText::OnKeyDown)
-    EVT_CHAR(     wxComboBoxText::OnChar)
-    EVT_KEY_UP(   wxComboBoxText::OnKeyUp)
-    EVT_TEXT( -1, wxComboBoxText::OnText)
+    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:
-    wxComboBoxChoice(wxComboBox *cb, int style)
+    wxComboBoxChoice( wxComboBox *cb, int style )
         : wxChoice( cb , 1 , wxDefaultPosition , wxDefaultSize , 0 , NULL , style & (wxCB_SORT) )
     {
         m_cb = cb;
     }
+
     int GetPopupWidth() const
     {
         switch ( GetWindowVariant() )
@@ -173,6 +181,7 @@ public:
             case wxWINDOW_VARIANT_NORMAL :
             case wxWINDOW_VARIANT_LARGE :
                 return 24 ;
+
             default :
                 return 21 ;
         }
@@ -197,22 +206,26 @@ protected:
         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;
 
+    friend class wxComboBox;
+
     DECLARE_EVENT_TABLE()
 };
 
 BEGIN_EVENT_TABLE(wxComboBoxChoice, wxChoice)
-    EVT_CHOICE(-1, wxComboBoxChoice::OnChoice)
+    EVT_CHOICE(wxID_ANY, wxComboBoxChoice::OnChoice)
 END_EVENT_TABLE()
 
 wxComboBox::~wxComboBox()
@@ -223,17 +236,19 @@ wxComboBox::~wxComboBox()
     // 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
-    if (m_text != NULL) {
+    if (m_text != NULL)
+    {
         delete m_text;
         m_text = NULL;
     }
-    if (m_choice != NULL) {
+
+    if (m_choice != NULL)
+    {
         delete m_choice;
         m_choice = NULL;
     }
 }
 
-
 // ----------------------------------------------------------------------------
 // geometry
 // ----------------------------------------------------------------------------
@@ -242,6 +257,7 @@ wxSize wxComboBox::DoGetBestSize() const
 {
     if (!m_choice && !m_text)
         return GetSize();
+
     wxSize size = m_choice->GetBestSize();
 
     if ( m_text != NULL )
@@ -249,6 +265,7 @@ wxSize wxComboBox::DoGetBestSize() const
         wxSize  sizeText = m_text->GetBestSize();
         if (sizeText.y > size.y)
             size.y = sizeText.y;
+
         size.x = m_choice->GetPopupWidth() + sizeText.x + MARGIN;
         size.x += TEXTFOCUSBORDER ;
         size.y += 2 * TEXTFOCUSBORDER ;
@@ -258,12 +275,13 @@ wxSize wxComboBox::DoGetBestSize() const
         // clipping is too tight
         size.y += 1 ;
     }
+
     return size;
 }
 
 void wxComboBox::DoMoveWindow(int x, int y, int width, int height)
 {
-    wxControl::DoMoveWindow(x, y, width , height );
+    wxControl::DoMoveWindow( x, y, width , height );
 
     if ( m_text == NULL )
     {
@@ -274,14 +292,13 @@ void wxComboBox::DoMoveWindow(int x, int y, int width, int height)
     else
     {
         wxCoord wText = width - m_choice->GetPopupWidth() - MARGIN;
-        m_text->SetSize(TEXTFOCUSBORDER, TEXTFOCUSBORDER, wText, -1 );
+        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
 // ----------------------------------------------------------------------------
@@ -305,34 +322,30 @@ bool wxComboBox::Show(bool show)
     return true;
 }
 
-void wxComboBox::SetFocus()
-{
-    if ( m_text != NULL) {
-        m_text->SetFocus();
-    }
-}
-
-
 void wxComboBox::DelegateTextChanged( 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,
-           const wxArrayString& 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 );
 
@@ -340,15 +353,16 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
                    chs.GetStrings(), style, validator, 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)
+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) )
@@ -379,7 +393,8 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
         m_choice->DoAppend( choices[ i ] );
     }
 
-    SetBestSize(size);   // Needed because it is a wxControlWithItems
+    // Needed because it is a wxControlWithItems
+    SetBestSize(size);
     SetStringSelection(value);
 
     return true;
@@ -390,18 +405,14 @@ wxString wxComboBox::GetValue() const
     wxString        result;
 
     if ( m_text == NULL )
-    {
         result = m_choice->GetString( m_choice->GetSelection() );
-    }
     else
-    {
         result = m_text->GetValue();
-    }
 
     return result;
 }
 
-int wxComboBox::GetCount() const
+unsigned int wxComboBox::GetCount() const
 {
     return m_choice->GetCount() ;
 }
@@ -415,28 +426,23 @@ void wxComboBox::SetValue(const wxString& value)
 }
 
 // Clipboard operations
+
 void wxComboBox::Copy()
 {
     if ( m_text != NULL )
-    {
         m_text->Copy();
-    }
 }
 
 void wxComboBox::Cut()
 {
     if ( m_text != NULL )
-    {
         m_text->Cut();
-    }
 }
 
 void wxComboBox::Paste()
 {
     if ( m_text != NULL )
-    {
         m_text->Paste();
-    }
 }
 
 void wxComboBox::SetEditable(bool editable)
@@ -502,27 +508,27 @@ int wxComboBox::DoAppend(const wxString& item)
     return m_choice->DoAppend( item ) ;
 }
 
-int wxComboBox::DoInsert(const wxString& item, int pos)
+int wxComboBox::DoInsert(const wxString& item, unsigned int pos)
 {
     return m_choice->DoInsert( item , pos ) ;
 }
 
-void wxComboBox::DoSetItemClientData(int n, void* clientData)
+void wxComboBox::DoSetItemClientData(unsigned int n, void* clientData)
 {
     return m_choice->DoSetItemClientData( n , clientData ) ;
 }
 
-void* wxComboBox::DoGetItemClientData(int n) const
+void* wxComboBox::DoGetItemClientData(unsigned int n) const
 {
     return m_choice->DoGetItemClientData( n ) ;
 }
 
-void wxComboBox::DoSetItemClientObject(int n, wxClientData* clientData)
+void wxComboBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData)
 {
-    return m_choice->DoSetItemClientObject( n , clientData ) ;
+    return m_choice->DoSetItemClientObject(n, clientData);
 }
 
-wxClientData* wxComboBox::DoGetItemClientObject(int n) const
+wxClientData* wxComboBox::DoGetItemClientObject(unsigned int n) const
 {
     return m_choice->DoGetItemClientObject( n ) ;
 }
@@ -531,15 +537,15 @@ void wxComboBox::FreeData()
 {
     if ( HasClientObjectData() )
     {
-        size_t count = GetCount();
-        for ( size_t n = 0; n < count; n++ )
+        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() )
@@ -563,9 +569,7 @@ void wxComboBox::SetSelection(int n)
     m_choice->SetSelection( n );
 
     if ( m_text != NULL )
-    {
-        m_text->SetValue( GetString( n ) );
-    }
+        m_text->SetValue(GetString(n));
 }
 
 int wxComboBox::FindString(const wxString& s, bool bCase) const
@@ -573,23 +577,23 @@ int wxComboBox::FindString(const wxString& s, bool bCase) const
     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
 {
-    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
         return wxEmptyString;
 }
 
-void wxComboBox::SetString(int n, const wxString& s)
+void wxComboBox::SetString(unsigned int n, const wxString& s)
 {
-    m_choice->SetString( n , s ) ;
+    m_choice->SetString( n , s );
 }
 
 bool wxComboBox::IsEditable() const
@@ -655,15 +659,18 @@ bool wxComboBox::CanRedo() const
         return false;
 }
 
-wxInt32 wxComboBox::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) )
+wxInt32 wxComboBox::MacControlHit( WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) )
 {
-    /* For consistency with other platforms, clicking in the text area does not constitute a selection
+/*
+    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);*/
+    ProcessCommand(event);
+*/
+
     return noErr ;
 }
 
-#endif
+#endif // wxUSE_COMBOBOX