X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/62f864c32c53356b7228591c85b14abc491c46f0..b4446c244775324631b8dd2b588ea35f32e71728:/src/mac/classic/combobox.cpp diff --git a/src/mac/classic/combobox.cpp b/src/mac/classic/combobox.cpp index 1a52315844..aba551e2f3 100644 --- a/src/mac/classic/combobox.cpp +++ b/src/mac/classic/combobox.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: combobox.cpp +// Name: src/mac/classic/combobox.cpp // Purpose: wxComboBox class // Author: Stefan Csomor // Modified by: @@ -9,13 +9,15 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "combobox.h" -#endif +#include "wx/wxprec.h" #include "wx/combobox.h" -#include "wx/button.h" -#include "wx/menu.h" + +#ifndef WX_PRECOMP + #include "wx/button.h" + #include "wx/menu.h" +#endif + #include "wx/mac/uma.h" IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl) @@ -138,7 +140,7 @@ public: protected: void OnChoice( wxCommandEvent& e ) { - wxString s = e.GetString(); + wxString s = e.GetString(); m_cb->DelegateChoice( s ); wxCommandEvent event2(wxEVT_COMMAND_COMBOBOX_SELECTED, m_cb->GetId() ); @@ -312,7 +314,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, wxString wxComboBox::GetValue() const { - wxString result; + wxString result; if ( m_text == NULL ) { @@ -424,27 +426,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 ) ; } @@ -453,15 +455,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() ) @@ -486,16 +488,16 @@ void wxComboBox::SetSelection(int n) if ( m_text != NULL ) { - m_text->SetValue( GetString( n ) ); + 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 ); } @@ -503,15 +505,16 @@ wxString wxComboBox::GetString(int n) const wxString wxComboBox::GetStringSelection() const { int sel = GetSelection (); - if (sel > -1) - return wxString(this->GetString (sel)); + + 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 @@ -585,4 +588,3 @@ void wxComboBox::MacHandleControlClick( WXWidget WXUNUSED(control) , wxInt16 WXU event.SetString(GetStringSelection()); ProcessCommand(event); } -