X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3340066af696862df9394469b341b700fe4e3a68..8e5ec9cc58bc1508aadf5bc2387609b245358a74:/src/mac/combobox.cpp?ds=inline diff --git a/src/mac/combobox.cpp b/src/mac/combobox.cpp index 22924613ea..830e8564a7 100644 --- a/src/mac/combobox.cpp +++ b/src/mac/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 ///////////////////////////////////////////////////////////////////////////// @@ -60,7 +60,7 @@ public: protected: void OnChar( wxKeyEvent& event ) { - if ( event.KeyCode() == WXK_RETURN ) + if ( event.GetKeyCode() == WXK_RETURN ) { wxString value = GetValue(); @@ -96,7 +96,7 @@ protected: wxWindow *parent = GetParent(); while( parent && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL ) { - parent = parent->GetParent() ; + parent = parent->GetParent() ; } if ( parent && parent->GetDefaultItem() ) { @@ -205,7 +205,7 @@ void wxComboBox::DoMoveWindow(int x, int y, int width, int height) { } else { - wxCoord wText = width - POPUPWIDTH; + wxCoord wText = width - POPUPWIDTH - MARGIN; m_text->SetSize(0, 0, wText, height); m_choice->SetSize(0 + wText + MARGIN, 0, POPUPWIDTH, -1); } @@ -311,6 +311,11 @@ 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 ) ; } @@ -397,13 +402,34 @@ 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->SetClientData( n , clientData ) ; +} + +void* wxComboBox::DoGetItemClientData(int n) const { - // I am not sure what other ports do, - // but wxMac chokes on empty entries. + return m_choice->GetClientData( n ) ; +} + +void wxComboBox::DoSetItemClientObject(int n, wxClientData* clientData) +{ + return m_choice->SetClientObject( n , clientData ) ; +} - if (!item.IsEmpty()) - m_choice->DoAppend( item ); +wxClientData* wxComboBox::DoGetItemClientObject(int n) const +{ + return m_choice->GetClientObject( n ) ; } void wxComboBox::Delete(int n) @@ -447,7 +473,7 @@ wxString wxComboBox::GetStringSelection() const if (sel > -1) return wxString(this->GetString (sel)); else - return wxString(""); + return wxEmptyString; } bool wxComboBox::SetStringSelection(const wxString& sel) @@ -462,7 +488,13 @@ 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 ) ; +} + + +void wxComboBox::MacHandleControlClick( WXWidget WXUNUSED(control) , wxInt16 WXUNUSED(controlpart) , bool WXUNUSED(mouseStillDown)) { wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId ); event.SetInt(GetSelection());