X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..2cf3a6d7bef6f20bea35062dd3d4dbf0aec9efb5:/src/mac/classic/combobox.cpp diff --git a/src/mac/classic/combobox.cpp b/src/mac/classic/combobox.cpp index 27aa1a58de..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,24 +9,24 @@ // 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" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl) -#endif // composite combobox implementation by Dan "Bud" Keith bud@otsys.com static int nextPopUpMenuId = 1000 ; -MenuHandle NewUniqueMenu() +MenuHandle NewUniqueMenu() { MenuHandle handle = NewMenu( nextPopUpMenuId , "\pMenu" ) ; nextPopUpMenuId++ ; @@ -114,7 +114,7 @@ protected: return; } } - + event.Skip(); } @@ -140,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() ); @@ -186,11 +186,11 @@ wxComboBox::~wxComboBox() wxSize wxComboBox::DoGetBestSize() const { wxSize size = m_choice->GetBestSize(); - + if ( m_text != NULL ) { wxSize sizeText = m_text->GetBestSize(); - + size.x = POPUPWIDTH + sizeText.x + MARGIN; } @@ -199,7 +199,7 @@ wxSize wxComboBox::DoGetBestSize() const void wxComboBox::DoMoveWindow(int x, int y, int width, int height) { height = POPUPHEIGHT; - + wxControl::DoMoveWindow(x, y, width, height); if ( m_text == NULL ) @@ -211,7 +211,7 @@ void wxComboBox::DoMoveWindow(int x, int y, int width, int height) { wxCoord wText = width - POPUPWIDTH - MARGIN; m_text->SetSize(0, 0, wText, height); m_choice->SetSize(0 + wText + MARGIN, 0, POPUPWIDTH, -1); - } + } } @@ -223,17 +223,17 @@ void wxComboBox::DoMoveWindow(int x, int y, int width, int height) { bool wxComboBox::Enable(bool enable) { if ( !wxControl::Enable(enable) ) - return FALSE; + return false; - return TRUE; + return true; } bool wxComboBox::Show(bool show) { if ( !wxControl::Show(show) ) - return FALSE; + return false; - return TRUE; + return true; } void wxComboBox::SetFocus() @@ -284,7 +284,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, if ( !wxControl::Create(parent, id, wxDefaultPosition, wxDefaultSize, style , wxDefaultValidator, name) ) { - return FALSE; + return false; } m_choice = new wxComboBoxChoice(this, style ); @@ -301,21 +301,21 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, csize.y = m_text->GetSize().y ; } } - + DoSetSize(pos.x, pos.y, csize.x, csize.y); - + for ( int i = 0 ; i < n ; i++ ) { m_choice->DoAppend( choices[ i ] ); } - return TRUE; + return true; } wxString wxComboBox::GetValue() const { - wxString result; - + wxString result; + if ( m_text == NULL ) { result = m_choice->GetString( m_choice->GetSelection() ); @@ -377,7 +377,7 @@ void wxComboBox::SetEditable(bool editable) int currentX, currentY; GetPosition( ¤tX, ¤tY ); - + int currentW, currentH; GetSize( ¤tW, ¤tH ); @@ -400,7 +400,7 @@ long wxComboBox::GetInsertionPoint() const return 0; } -long wxComboBox::GetLastPosition() const +wxTextPos wxComboBox::GetLastPosition() const { // TODO return 0; @@ -421,32 +421,32 @@ void wxComboBox::SetSelection(long from, long to) // TODO } -int wxComboBox::DoAppend(const wxString& item) +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 ) ; } @@ -455,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() ) @@ -485,19 +485,19 @@ int wxComboBox::GetSelection() const 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) 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 ); } @@ -505,31 +505,82 @@ 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; } -bool wxComboBox::SetStringSelection(const wxString& sel) +void wxComboBox::SetString(unsigned int n, const wxString& s) { - int s = FindString (sel); - if (s > -1) - { - SetSelection (s); - return TRUE; - } + m_choice->SetString( n , s ); +} + +bool wxComboBox::IsEditable() const +{ + return m_text != NULL && !HasFlag(wxCB_READONLY); +} + +void wxComboBox::Undo() +{ + if (m_text != NULL) + m_text->Undo(); +} + +void wxComboBox::Redo() +{ + if (m_text != NULL) + m_text->Redo(); +} + +void wxComboBox::SelectAll() +{ + if (m_text != NULL) + m_text->SelectAll(); +} + +bool wxComboBox::CanCopy() const +{ + if (m_text != NULL) + return m_text->CanCopy(); else - return FALSE; + return false; } -void wxComboBox::SetString(int n, const wxString& s) +bool wxComboBox::CanCut() const { - m_choice->SetString( n , s ) ; + if (m_text != NULL) + return m_text->CanCut(); + else + return false; } +bool wxComboBox::CanPaste() const +{ + if (m_text != NULL) + return m_text->CanPaste(); + else + return false; +} + +bool wxComboBox::CanUndo() const +{ + if (m_text != NULL) + return m_text->CanUndo(); + else + return false; +} -void wxComboBox::MacHandleControlClick( WXWidget WXUNUSED(control) , wxInt16 WXUNUSED(controlpart) , bool WXUNUSED(mouseStillDown)) +bool wxComboBox::CanRedo() const +{ + if (m_text != NULL) + return m_text->CanRedo(); + else + return false; +} + +void wxComboBox::MacHandleControlClick( WXWidget WXUNUSED(control) , wxInt16 WXUNUSED(controlpart) , bool WXUNUSED(mouseStillDown)) { wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId ); event.SetInt(GetSelection()); @@ -537,4 +588,3 @@ void wxComboBox::MacHandleControlClick( WXWidget WXUNUSED(control) , wxInt16 WXU event.SetString(GetStringSelection()); ProcessCommand(event); } -