X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12f316268643e7a66b142804c3b9b0aec4af5801..44c44c82a3fe5362bac5cc9536f06eeac52af00c:/src/mac/carbon/combobox.cpp diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp index 718fe840d6..7d2a6819ea 100644 --- a/src/mac/carbon/combobox.cpp +++ b/src/mac/carbon/combobox.cpp @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// // 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 -// Licence: wxWindows licence +// Copyright: (c) Stefan Csomor +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -14,6 +14,7 @@ #endif #include "wx/combobox.h" +#include "wx/button.h" #include "wx/menu.h" #include "wx/mac/uma.h" @@ -51,18 +52,69 @@ class wxComboBoxText : public wxTextCtrl { public: wxComboBoxText( wxComboBox * cb ) - : wxTextCtrl( cb->GetParent(), 1 ) + : wxTextCtrl( cb , 1 ) { m_cb = cb; } protected: - void OnTextChange( wxCommandEvent& event ) + void OnChar( wxKeyEvent& event ) { - wxString s = GetValue(); - - m_cb->DelegateTextChanged( s ); - + 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; + } + } + event.Skip(); } @@ -73,14 +125,14 @@ private: }; BEGIN_EVENT_TABLE(wxComboBoxText, wxTextCtrl) - EVT_TEXT(-1, wxComboBoxText::OnTextChange) + EVT_CHAR( wxComboBoxText::OnChar) END_EVENT_TABLE() class wxComboBoxChoice : public wxChoice { public: wxComboBoxChoice(wxComboBox *cb, int style) - : wxChoice( cb->GetParent(), 1 ) + : wxChoice( cb , 1 ) { m_cb = cb; } @@ -91,6 +143,11 @@ 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); } private: @@ -103,16 +160,19 @@ BEGIN_EVENT_TABLE(wxComboBoxChoice, wxChoice) EVT_CHOICE(-1, wxComboBoxChoice::OnChoice) END_EVENT_TABLE() - - - wxComboBox::~wxComboBox() { - // delete the controls now, don't leave them alive even though they woudl + // 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 - 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; + } } @@ -124,7 +184,7 @@ wxSize wxComboBox::DoGetBestSize() const { wxSize size = m_choice->GetBestSize(); - if ( m_text != 0 ) + if ( m_text != NULL ) { wxSize sizeText = m_text->GetBestSize(); @@ -139,15 +199,15 @@ 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); + m_choice->SetSize(0, 0 , width, -1); } else { - wxCoord wText = width - POPUPWIDTH; - m_text->SetSize(x, y, wText, height); - m_choice->SetSize(x + wText + MARGIN, y, POPUPWIDTH, -1); + wxCoord wText = width - POPUPWIDTH - MARGIN; + m_text->SetSize(0, 0, wText, height); + m_choice->SetSize(0 + wText + MARGIN, 0, POPUPWIDTH, -1); } } @@ -162,13 +222,6 @@ bool wxComboBox::Enable(bool enable) if ( !wxControl::Enable(enable) ) return FALSE; - m_choice->Enable(enable); - - if ( m_text != 0 ) - { - m_text->Enable(enable); - } - return TRUE; } @@ -177,22 +230,20 @@ 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 TRUE; } +void wxComboBox::SetFocus() +{ + if ( m_text != NULL) { + m_text->SetFocus(); + } +} + -void wxComboBox::DelegateTextChanged( const wxString& value ) { +void wxComboBox::DelegateTextChanged( const wxString& value ) +{ + SetStringSelection( value ); } @@ -206,27 +257,23 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, const wxString& value, const wxPoint& pos, const wxSize& size, - int n, const wxString choices[], - long style, + int n, const wxString choices[], + long style, const wxValidator& validator, const wxString& name) { - - Rect bounds ; - Str255 title ; - - if ( !wxControl::Create(parent, id, pos, size, style, + if ( !wxControl::Create(parent, id, wxDefaultPosition, wxDefaultSize, style , wxDefaultValidator, name) ) { return FALSE; } - m_choice = new wxComboBoxChoice(this, style); + m_choice = new wxComboBoxChoice(this, style ); wxSize csize = size; if ( style & wxCB_READONLY ) { - m_text = 0; + m_text = NULL; } else { @@ -237,21 +284,12 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, } DoSetSize(pos.x, pos.y, csize.x, csize.y); + for ( int i = 0 ; i < n ; i++ ) { - m_choice->DoAppend( choices[ 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); - return TRUE; } @@ -259,7 +297,7 @@ wxString wxComboBox::GetValue() const { wxString result; - if ( m_text == 0 ) + if ( m_text == NULL ) { result = m_choice->GetString( m_choice->GetSelection() ); } @@ -273,13 +311,18 @@ wxString wxComboBox::GetValue() const 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(); } @@ -287,7 +330,7 @@ void wxComboBox::Copy() void wxComboBox::Cut() { - if ( m_text != 0 ) + if ( m_text != NULL ) { m_text->Cut(); } @@ -295,7 +338,7 @@ void wxComboBox::Cut() void wxComboBox::Paste() { - if ( m_text != 0 ) + if ( m_text != NULL ) { m_text->Paste(); } @@ -303,14 +346,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; @@ -361,11 +404,19 @@ void wxComboBox::SetSelection(long from, long to) void wxComboBox::Append(const wxString& item) { - m_choice->DoAppend( item ); + // I am not sure what other ports do, + // but wxMac chokes on empty entries. + + if (!item.IsEmpty()) + m_choice->DoAppend( item ); } void wxComboBox::Delete(int n) { + if ( HasClientObjectData() ) + { + SetClientObject(n, NULL); + } m_choice->Delete( n ); } @@ -383,7 +434,7 @@ void wxComboBox::SetSelection(int n) { m_choice->SetSelection( n ); - if ( m_text != 0 ) + if ( m_text != NULL ) { m_text->SetValue( GetString( n ) ); } @@ -420,10 +471,10 @@ bool wxComboBox::SetStringSelection(const wxString& sel) return FALSE; } -void wxComboBox::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) +void wxComboBox::MacHandleControlClick( WXWidget WXUNUSED(control) , wxInt16 WXUNUSED(controlpart) ) { wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId ); - event.SetInt(GetSelection()); + event.SetInt(GetSelection()); event.SetEventObject(this); event.SetString(GetStringSelection()); ProcessCommand(event);