X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/327788acc5e4915df4e9e97db7fb08a4c4a00cdd..db36543353d37c2357e8e30aab53ff37337b1127:/src/mac/carbon/combobox.cpp diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp index 4fa350e709..7df5846889 100644 --- a/src/mac/carbon/combobox.cpp +++ b/src/mac/carbon/combobox.cpp @@ -1,11 +1,11 @@ ///////////////////////////////////////////////////////////////////////////// // Name: combobox.cpp // Purpose: wxComboBox class -// Author: AUTHOR +// Author: Stefan Csomor // Modified by: -// Created: ??/??/98 +// Created: 1998-01-01 // RCS-ID: $Id$ -// Copyright: (c) AUTHOR +// Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -14,6 +14,7 @@ #endif #include "wx/combobox.h" +#include "wx/button.h" #include "wx/menu.h" #include "wx/mac/uma.h" @@ -38,8 +39,18 @@ MenuHandle NewUniqueMenu() // ---------------------------------------------------------------------------- // 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 = 6; +static const int POPUPWIDTH = 24; +// this is the border a focus rect on OSX is needing +static const int TEXTFOCUSBORDER = 3 ; +#else static const wxCoord MARGIN = 2; static const int POPUPWIDTH = 18; +static const int TEXTFOCUSBORDER = 0 ; +#endif static const int POPUPHEIGHT = 23; @@ -57,13 +68,63 @@ public: } protected: - void OnTextChange( wxCommandEvent& event ) + void OnChar( wxKeyEvent& event ) { - wxString s = GetValue(); + if ( event.GetKeyCode() == WXK_RETURN ) + { + wxString value = GetValue(); + + if ( m_cb->GetCount() == 0 ) + { + // make Enter generate "selected" event if there is only one item + // in the combobox - without it, it's impossible to select it at + // all! + wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, m_cb->GetId() ); + event.SetInt( 0 ); + event.SetString( value ); + event.SetEventObject( m_cb ); + m_cb->GetEventHandler()->ProcessEvent( event ); + } + else + { + // add the item to the list if it's not there yet + if ( m_cb->FindString(value) == wxNOT_FOUND ) + { + m_cb->Append(value); + m_cb->SetStringSelection(value); + + // and generate the selected event for it + wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, m_cb->GetId() ); + event.SetInt( m_cb->GetCount() - 1 ); + event.SetString( value ); + event.SetEventObject( m_cb ); + m_cb->GetEventHandler()->ProcessEvent( event ); + } + + // This will invoke the dialog default action, such + // as the clicking the default button. + + wxWindow *parent = GetParent(); + while( parent && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL ) { + parent = parent->GetParent() ; + } + if ( parent && parent->GetDefaultItem() ) + { + wxButton *def = wxDynamicCast(parent->GetDefaultItem(), + wxButton); + if ( def && def->IsEnabled() ) + { + wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() ); + event.SetEventObject(def); + def->Command(event); + return ; + } + } + + return; + } + } - if (!s.IsEmpty()) - m_cb->DelegateTextChanged( s ); - event.Skip(); } @@ -74,7 +135,7 @@ private: }; BEGIN_EVENT_TABLE(wxComboBoxText, wxTextCtrl) - EVT_TEXT(-1, wxComboBoxText::OnTextChange) + EVT_CHAR( wxComboBoxText::OnChar) END_EVENT_TABLE() class wxComboBoxChoice : public wxChoice @@ -92,7 +153,19 @@ protected: 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); } + virtual wxSize DoGetBestSize() const + { + wxSize sz = wxChoice::DoGetBestSize() ; + if (! m_cb->HasFlag(wxCB_READONLY) ) + sz.x = POPUPWIDTH; + return sz ; + } private: wxComboBox *m_cb; @@ -106,7 +179,10 @@ END_EVENT_TABLE() wxComboBox::~wxComboBox() { - // delete the controls now, don't leave them alive even though they would + // 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 if (m_text != NULL) { @@ -126,32 +202,36 @@ wxComboBox::~wxComboBox() wxSize wxComboBox::DoGetBestSize() const { + if (!m_choice && !m_text) + return GetSize(); wxSize size = m_choice->GetBestSize(); - if ( m_text != 0 ) + if ( m_text != NULL ) { wxSize sizeText = m_text->GetBestSize(); - + if (sizeText.y > size.y) + size.y = sizeText.y; size.x = POPUPWIDTH + sizeText.x + MARGIN; + size.x += TEXTFOCUSBORDER ; + size.y += 2 * TEXTFOCUSBORDER ; } - return size; } void wxComboBox::DoMoveWindow(int x, int y, int width, int height) { - height = POPUPHEIGHT; + wxControl::DoMoveWindow(x, y, width , height ); - wxControl::DoMoveWindow(x, y, width, height); - - if ( m_text == 0 ) + if ( m_text == NULL ) { - m_choice->SetSize(0, 0 , width, -1); + // we might not be fully constructed yet, therefore watch out... + if ( m_choice ) + m_choice->SetSize(0, 0 , width, -1); } else { - wxCoord wText = width - POPUPWIDTH; - m_text->SetSize(0, 0, wText, height); - m_choice->SetSize(0 + wText + MARGIN, 0, POPUPWIDTH, -1); + wxCoord wText = width - POPUPWIDTH - MARGIN; + m_text->SetSize(TEXTFOCUSBORDER, TEXTFOCUSBORDER, wText, -1 ); + m_choice->SetSize(TEXTFOCUSBORDER + wText + MARGIN, TEXTFOCUSBORDER, POPUPWIDTH, -1); } } @@ -177,13 +257,17 @@ bool wxComboBox::Show(bool show) return TRUE; } - void wxComboBox::SetFocus() - { - m_text->SetFocus(); - } +void wxComboBox::SetFocus() +{ + if ( m_text != NULL) { + m_text->SetFocus(); + } +} -void wxComboBox::DelegateTextChanged( const wxString& value ) { +void wxComboBox::DelegateTextChanged( const wxString& value ) +{ + SetStringSelection( value ); } @@ -197,15 +281,27 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, const wxString& value, const wxPoint& pos, const wxSize& size, - int n, const wxString choices[], + const wxArrayString& choices, long style, const wxValidator& validator, const wxString& name) { + wxCArrayString chs( choices ); + + return Create( parent, id, value, pos, size, chs.GetCount(), + chs.GetStrings(), style, validator, name ); +} - Rect bounds ; - Str255 title ; +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 , wxDefaultValidator, name) ) { @@ -213,17 +309,18 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, } m_choice = new wxComboBoxChoice(this, style ); - wxSize csize = size; if ( style & wxCB_READONLY ) { - m_text = 0; + m_text = NULL; } 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 ; } } @@ -234,6 +331,8 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, m_choice->DoAppend( choices[ i ] ); } + SetBestSize(size); // Needed because it is a wxControlWithItems + return TRUE; } @@ -241,7 +340,7 @@ wxString wxComboBox::GetValue() const { wxString result; - if ( m_text == 0 ) + if ( m_text == NULL ) { result = m_choice->GetString( m_choice->GetSelection() ); } @@ -253,15 +352,25 @@ wxString wxComboBox::GetValue() const return result; } +int wxComboBox::GetCount() const +{ + return m_choice->GetCount() ; +} + void wxComboBox::SetValue(const wxString& value) { + int s = FindString (value); + if (s == wxNOT_FOUND && !HasFlag(wxCB_READONLY) ) + { + m_choice->Append(value) ; + } SetStringSelection( value ) ; } // Clipboard operations void wxComboBox::Copy() { - if ( m_text != 0 ) + if ( m_text != NULL ) { m_text->Copy(); } @@ -269,7 +378,7 @@ void wxComboBox::Copy() void wxComboBox::Cut() { - if ( m_text != 0 ) + if ( m_text != NULL ) { m_text->Cut(); } @@ -277,7 +386,7 @@ void wxComboBox::Cut() void wxComboBox::Paste() { - if ( m_text != 0 ) + if ( m_text != NULL ) { m_text->Paste(); } @@ -285,14 +394,14 @@ void wxComboBox::Paste() void wxComboBox::SetEditable(bool editable) { - if ( ( m_text == 0 ) && editable ) + if ( ( m_text == NULL ) && editable ) { m_text = new wxComboBoxText( this ); } - else if ( ( m_text != 0 ) && !editable ) + else if ( ( m_text != NULL ) && !editable ) { delete m_text; - m_text = 0; + m_text = NULL; } int currentX, currentY; @@ -341,22 +450,59 @@ void wxComboBox::SetSelection(long from, long to) // TODO } -void wxComboBox::Append(const wxString& item) +int wxComboBox::DoAppend(const wxString& item) +{ + return m_choice->DoAppend( item ) ; +} + +int wxComboBox::DoInsert(const wxString& item, int pos) +{ + return m_choice->DoInsert( item , pos ) ; +} + +void wxComboBox::DoSetItemClientData(int n, void* clientData) +{ + return m_choice->DoSetItemClientData( n , clientData ) ; +} + +void* wxComboBox::DoGetItemClientData(int n) const +{ + return m_choice->DoGetItemClientData( n ) ; +} + +void wxComboBox::DoSetItemClientObject(int n, wxClientData* clientData) { - // I am not sure what other ports do, - // but wxMac chokes on empty entries. + return m_choice->DoSetItemClientObject( n , clientData ) ; +} - if (!item.IsEmpty()) - m_choice->DoAppend( item ); +wxClientData* wxComboBox::DoGetItemClientObject(int n) const +{ + return m_choice->DoGetItemClientObject( n ) ; +} + +void wxComboBox::FreeData() +{ + if ( HasClientObjectData() ) + { + size_t count = GetCount(); + for ( size_t n = 0; n < count; n++ ) + { + SetClientObject( n, NULL ); + } + } } void wxComboBox::Delete(int n) { + // force client object deletion + if( HasClientObjectData() ) + SetClientObject( n, NULL ); m_choice->Delete( n ); } void wxComboBox::Clear() { + FreeData(); m_choice->Clear(); } @@ -369,7 +515,7 @@ void wxComboBox::SetSelection(int n) { m_choice->SetSelection( n ); - if ( m_text != 0 ) + if ( m_text != NULL ) { m_text->SetValue( GetString( n ) ); } @@ -391,7 +537,7 @@ wxString wxComboBox::GetStringSelection() const if (sel > -1) return wxString(this->GetString (sel)); else - return wxString(""); + return wxEmptyString; } bool wxComboBox::SetStringSelection(const wxString& sel) @@ -406,12 +552,19 @@ bool wxComboBox::SetStringSelection(const wxString& sel) return FALSE; } -void wxComboBox::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) +void wxComboBox::SetString(int n, const wxString& s) +{ + m_choice->SetString( n , s ) ; +} + + +wxInt32 wxComboBox::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) ) { wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId ); event.SetInt(GetSelection()); event.SetEventObject(this); event.SetString(GetStringSelection()); ProcessCommand(event); + return noErr ; }