X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/29998406a89ac065ab565b21d6d224287d05176b..4813bb8d72d4e6821e031f2b19baaa338b714d39:/src/mac/carbon/combobox.cpp diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp index d653c99c05..4db3c45a02 100644 --- a/src/mac/carbon/combobox.cpp +++ b/src/mac/carbon/combobox.cpp @@ -1,7 +1,7 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: combobox.cpp +// Name: src/mac/carbon/combobox.cpp // Purpose: wxComboBox class -// Author: Stefan Csomor +// Author: Stefan Csomor, Dan "Bud" Keith (composite combobox) // Modified by: // Created: 1998-01-01 // RCS-ID: $Id$ @@ -9,32 +9,39 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "combobox.h" -#endif - #include "wx/wxprec.h" #if wxUSE_COMBOBOX #include "wx/combobox.h" -#include "wx/button.h" -#include "wx/menu.h" + +#ifndef WX_PRECOMP + #include "wx/button.h" + #include "wx/menu.h" + #include "wx/containr.h" + #include "wx/toplevel.h" + #include "wx/textctrl.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 +WX_DELEGATE_TO_CONTROL_CONTAINER(wxComboBox, wxControl) + +BEGIN_EVENT_TABLE(wxComboBox, wxControl) + WX_EVENT_TABLE_CONTROL_CONTAINER(wxComboBox) +END_EVENT_TABLE() static int nextPopUpMenuId = 1000 ; + MenuHandle NewUniqueMenu() { - MenuHandle handle = NewMenu( nextPopUpMenuId , "\pMenu" ) ; - nextPopUpMenuId++ ; - return handle ; + MenuHandle handle = UMANewMenu(nextPopUpMenuId, wxString(wxT("Menu")), wxFont::GetDefaultEncoding() ); + nextPopUpMenuId++ ; + + return handle ; } @@ -43,17 +50,11 @@ 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 = 4; // 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 TEXTFOCUSBORDER = 0 ; -#endif -static const int POPUPHEIGHT = 23; // ---------------------------------------------------------------------------- @@ -67,6 +68,7 @@ public: : wxTextCtrl( cb , 1 ) { m_cb = cb; + SetTriggerOnSetValue( false ); } protected: @@ -81,9 +83,17 @@ protected: NavEvent.SetWindowChange(false); // Get the parent of the combo and have it process the navigation? - if (m_cb->GetParent()->GetEventHandler()->ProcessEvent(NavEvent)) + if (m_cb->GetParent()->HandleWindowEvent(NavEvent)) return; } + + // send the event to the combobox class in case the user has bound EVT_CHAR + wxKeyEvent kevt(event); + kevt.SetEventObject(m_cb); + if (m_cb->HandleWindowEvent(kevt)) + // If the event was handled and not skipped then we're done + return; + if ( event.GetKeyCode() == WXK_RETURN ) { wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_cb->GetId()); @@ -91,25 +101,20 @@ protected: event.SetInt( m_cb->GetSelection() ); event.SetEventObject( m_cb ); - // This will invoke the dialog default action, such - // as the clicking the default button. - - if (!m_cb->GetEventHandler()->ProcessEvent( event )) + // This will invoke the dialog default action, + // such as the clicking the default button. + if (!m_cb->HandleWindowEvent( event )) { - wxWindow *parent = GetParent(); - while( parent && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL ) { - parent = parent->GetParent() ; - } - if ( parent && parent->GetDefaultItem() ) + wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow); + if ( tlw && tlw->GetDefaultItem() ) { - wxButton *def = wxDynamicCast(parent->GetDefaultItem(), - wxButton); + wxButton *def = wxDynamicCast(tlw->GetDefaultItem(), wxButton); if ( def && def->IsEnabled() ) { - wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() ); + wxCommandEvent event( wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() ); event.SetEventObject(def); def->Command(event); - } + } } return; @@ -119,18 +124,30 @@ protected: event.Skip(); } - // Use the KeyUp as a naive approximation for TEXT_UPDATED, even though it is somewhat delayed - // but this is less complicated than dealing with idle-ness, and is much better than nothing void OnKeyUp( wxKeyEvent& event ) { - if ( event.GetKeyCode() != WXK_RETURN && event.GetKeyCode() != WXK_TAB ) - { - wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_cb->GetId()); - event.SetString( GetValue() ); - event.SetEventObject( m_cb ); - m_cb->GetEventHandler()->ProcessEvent(event); - } + event.SetEventObject(m_cb); + event.SetId(m_cb->GetId()); + if (! m_cb->HandleWindowEvent(event)) + event.Skip(); } + + void OnKeyDown( wxKeyEvent& event ) + { + event.SetEventObject(m_cb); + event.SetId(m_cb->GetId()); + if (! m_cb->HandleWindowEvent(event)) + event.Skip(); + } + + void OnText( wxCommandEvent& event ) + { + event.SetEventObject(m_cb); + event.SetId(m_cb->GetId()); + if (! m_cb->HandleWindowEvent(event)) + event.Skip(); + } + private: wxComboBox *m_cb; @@ -138,18 +155,21 @@ private: }; BEGIN_EVENT_TABLE(wxComboBoxText, wxTextCtrl) - EVT_CHAR( wxComboBoxText::OnChar) - EVT_KEY_UP( wxComboBoxText::OnKeyUp) + EVT_KEY_DOWN(wxComboBoxText::OnKeyDown) + EVT_CHAR(wxComboBoxText::OnChar) + EVT_KEY_UP(wxComboBoxText::OnKeyUp) + EVT_TEXT(wxID_ANY, wxComboBoxText::OnText) END_EVENT_TABLE() class wxComboBoxChoice : public wxChoice { public: - wxComboBoxChoice(wxComboBox *cb, int style) - : wxChoice( cb , 1 ) + wxComboBoxChoice( wxComboBox *cb, int style ) + : wxChoice( cb , 1 , wxDefaultPosition , wxDefaultSize , 0 , NULL , style & (wxCB_SORT) ) { m_cb = cb; } + int GetPopupWidth() const { switch ( GetWindowVariant() ) @@ -157,6 +177,7 @@ public: case wxWINDOW_VARIANT_NORMAL : case wxWINDOW_VARIANT_LARGE : return 24 ; + default : return 21 ; } @@ -181,43 +202,46 @@ protected: TextEvent.SetEventObject( m_cb ); m_cb->ProcessCommand( TextEvent ); } + virtual wxSize DoGetBestSize() const { wxSize sz = wxChoice::DoGetBestSize() ; if (! m_cb->HasFlag(wxCB_READONLY) ) sz.x = GetPopupWidth() ; + return sz ; } private: wxComboBox *m_cb; + friend class wxComboBox; + DECLARE_EVENT_TABLE() }; BEGIN_EVENT_TABLE(wxComboBoxChoice, wxChoice) - EVT_CHOICE(-1, wxComboBoxChoice::OnChoice) + EVT_CHOICE(wxID_ANY, wxComboBoxChoice::OnChoice) END_EVENT_TABLE() wxComboBox::~wxComboBox() { - // 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) { + if (m_text != NULL) + { delete m_text; m_text = NULL; } - if (m_choice != NULL) { + + if (m_choice != NULL) + { delete m_choice; m_choice = NULL; } } - // ---------------------------------------------------------------------------- // geometry // ---------------------------------------------------------------------------- @@ -226,6 +250,7 @@ wxSize wxComboBox::DoGetBestSize() const { if (!m_choice && !m_text) return GetSize(); + wxSize size = m_choice->GetBestSize(); if ( m_text != NULL ) @@ -233,6 +258,7 @@ wxSize wxComboBox::DoGetBestSize() const wxSize sizeText = m_text->GetBestSize(); if (sizeText.y > size.y) size.y = sizeText.y; + size.x = m_choice->GetPopupWidth() + sizeText.x + MARGIN; size.x += TEXTFOCUSBORDER ; size.y += 2 * TEXTFOCUSBORDER ; @@ -242,12 +268,13 @@ wxSize wxComboBox::DoGetBestSize() const // clipping is too tight size.y += 1 ; } + return size; } void wxComboBox::DoMoveWindow(int x, int y, int width, int height) { - wxControl::DoMoveWindow(x, y, width , height ); + wxControl::DoMoveWindow( x, y, width , height ); if ( m_text == NULL ) { @@ -258,14 +285,13 @@ void wxComboBox::DoMoveWindow(int x, int y, int width, int height) else { wxCoord wText = width - m_choice->GetPopupWidth() - MARGIN; - m_text->SetSize(TEXTFOCUSBORDER, TEXTFOCUSBORDER, wText, -1 ); + m_text->SetSize(TEXTFOCUSBORDER, TEXTFOCUSBORDER, wText, -1); + // put it at an inset of 1 to have outer area shadows drawn as well m_choice->SetSize(TEXTFOCUSBORDER + wText + MARGIN - 1 , TEXTFOCUSBORDER, m_choice->GetPopupWidth() , -1); } } - - // ---------------------------------------------------------------------------- // operations forwarded to the subcontrols // ---------------------------------------------------------------------------- @@ -275,6 +301,9 @@ bool wxComboBox::Enable(bool enable) if ( !wxControl::Enable(enable) ) return false; + if (m_text) + m_text->Enable(enable); + return true; } @@ -286,50 +315,50 @@ bool wxComboBox::Show(bool show) return true; } -void wxComboBox::SetFocus() -{ - if ( m_text != NULL) { - m_text->SetFocus(); - } -} - - void wxComboBox::DelegateTextChanged( const wxString& value ) { SetStringSelection( value ); } - void wxComboBox::DelegateChoice( const wxString& value ) { SetStringSelection( value ); } +void wxComboBox::Init() +{ + WX_INIT_CONTROL_CONTAINER(); +} -bool wxComboBox::Create(wxWindow *parent, wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style, - const wxValidator& validator, - const wxString& name) +bool wxComboBox::Create(wxWindow *parent, + wxWindowID id, + const wxString& value, + const wxPoint& pos, + const wxSize& size, + const wxArrayString& choices, + long style, + const wxValidator& validator, + const wxString& name) { - wxCArrayString chs( choices ); + if ( !Create( parent, id, value, pos, size, 0, NULL, + style, validator, name ) ) + return false; - return Create( parent, id, value, pos, size, chs.GetCount(), - chs.GetStrings(), style, validator, name ); -} + Append(choices); + return true; +} -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) +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 , validator, name) ) @@ -355,14 +384,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 ] ); - } + Append( n, choices ); - SetBestSize(size); // Needed because it is a wxControlWithItems + // Needed because it is a wxControlWithItems + SetInitialSize(size); SetStringSelection(value); - + return true; } @@ -371,18 +398,14 @@ wxString wxComboBox::GetValue() const wxString result; if ( m_text == NULL ) - { result = m_choice->GetString( m_choice->GetSelection() ); - } else - { result = m_text->GetValue(); - } return result; } -int wxComboBox::GetCount() const +unsigned int wxComboBox::GetCount() const { return m_choice->GetCount() ; } @@ -395,29 +418,34 @@ void wxComboBox::SetValue(const wxString& value) m_text->SetValue( value ); } +void wxComboBox::WriteText(const wxString& text) +{ + m_text->WriteText(text); +} + +void wxComboBox::GetSelection(long *from, long *to) const +{ + m_text->GetSelection(from, to); +} + // Clipboard operations + void wxComboBox::Copy() { if ( m_text != NULL ) - { m_text->Copy(); - } } void wxComboBox::Cut() { if ( m_text != NULL ) - { m_text->Cut(); - } } void wxComboBox::Paste() { if ( m_text != NULL ) - { m_text->Paste(); - } } void wxComboBox::SetEditable(bool editable) @@ -443,95 +471,84 @@ void wxComboBox::SetEditable(bool editable) void wxComboBox::SetInsertionPoint(long pos) { - // TODO + if ( m_text ) + m_text->SetInsertionPoint(pos); } void wxComboBox::SetInsertionPointEnd() { - // TODO + if ( m_text ) + m_text->SetInsertionPointEnd(); } long wxComboBox::GetInsertionPoint() const { - // TODO + if ( m_text ) + return m_text->GetInsertionPoint(); return 0; } wxTextPos wxComboBox::GetLastPosition() const { - // TODO + if ( m_text ) + return m_text->GetLastPosition(); return 0; } void wxComboBox::Replace(long from, long to, const wxString& value) { - // TODO + if ( m_text ) + m_text->Replace(from,to,value); } void wxComboBox::Remove(long from, long to) { - // TODO + if ( m_text ) + m_text->Remove(from,to); } void wxComboBox::SetSelection(long from, long to) { - // TODO -} - -int wxComboBox::DoAppend(const wxString& item) -{ - return m_choice->DoAppend( item ) ; + if ( m_text ) + m_text->SetSelection(from,to); } -int wxComboBox::DoInsert(const wxString& item, int pos) +int wxComboBox::DoInsertItems(const wxArrayStringsAdapter& items, + unsigned int pos, + void **clientData, + wxClientDataType type) { - return m_choice->DoInsert( item , pos ) ; + return m_choice->DoInsertItems(items, pos, clientData, type); } -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) +wxClientDataType wxComboBox::GetClientDataType() const { - return m_choice->DoSetItemClientObject( n , clientData ) ; + return m_choice->GetClientDataType(); } -wxClientData* wxComboBox::DoGetItemClientObject(int n) const +void wxComboBox::SetClientDataType(wxClientDataType clientDataItemsType) { - return m_choice->DoGetItemClientObject( n ) ; + m_choice->SetClientDataType(clientDataItemsType); } -void wxComboBox::FreeData() +void wxComboBox::DoDeleteOneItem(unsigned int n) { - if ( HasClientObjectData() ) - { - size_t count = GetCount(); - for ( size_t n = 0; n < count; n++ ) - { - SetClientObject( n, NULL ); - } - } + m_choice->DoDeleteOneItem( n ); } -void wxComboBox::Delete(int n) +void wxComboBox::DoClear() { - // force client object deletion - if( HasClientObjectData() ) - SetClientObject( n, NULL ); - m_choice->Delete( n ); -} - -void wxComboBox::Clear() -{ - FreeData(); - m_choice->Clear(); + m_choice->DoClear(); } int wxComboBox::GetSelection() const @@ -544,33 +561,31 @@ void wxComboBox::SetSelection(int n) m_choice->SetSelection( n ); if ( m_text != NULL ) - { - m_text->SetValue( GetString( n ) ); - } + m_text->SetValue(n != wxNOT_FOUND ? GetString(n) : wxString(wxEmptyString)); } -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 ); } wxString wxComboBox::GetStringSelection() const { - int sel = GetSelection (); - if (sel > -1) - return wxString(this->GetString (sel)); + int sel = GetSelection(); + 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 @@ -636,15 +651,18 @@ bool wxComboBox::CanRedo() const return false; } -wxInt32 wxComboBox::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) ) +wxInt32 wxComboBox::MacControlHit( WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) ) { - /* For consistency with other platforms, clicking in the text area does not constitute a selection +/* + For consistency with other platforms, clicking in the text area does not constitute a selection wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId ); event.SetInt(GetSelection()); event.SetEventObject(this); event.SetString(GetStringSelection()); - ProcessCommand(event);*/ + ProcessCommand(event); +*/ + return noErr ; } -#endif +#endif // wxUSE_COMBOBOX