X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3b3dc8019a520ce5e166c8ae9098ba020f8b3f94..6cef0db28018fd2644ee4e38af715872e5242459:/src/mac/carbon/combobox.cpp?ds=sidebyside diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp index dd73be5b4c..4db3c45a02 100644 --- a/src/mac/carbon/combobox.cpp +++ b/src/mac/carbon/combobox.cpp @@ -18,14 +18,16 @@ #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/containr.h" #include "wx/mac/uma.h" IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl) -WX_DELEGATE_TO_CONTROL_CONTAINER(wxComboBox) +WX_DELEGATE_TO_CONTROL_CONTAINER(wxComboBox, wxControl) BEGIN_EVENT_TABLE(wxComboBox, wxControl) WX_EVENT_TABLE_CONTROL_CONTAINER(wxComboBox) @@ -36,7 +38,7 @@ static int nextPopUpMenuId = 1000 ; MenuHandle NewUniqueMenu() { - MenuHandle handle = NewMenu( nextPopUpMenuId , "\pMenu" ) ; + MenuHandle handle = UMANewMenu(nextPopUpMenuId, wxString(wxT("Menu")), wxFont::GetDefaultEncoding() ); nextPopUpMenuId++ ; return handle ; @@ -48,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; // ---------------------------------------------------------------------------- @@ -87,14 +83,14 @@ 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->GetEventHandler()->ProcessEvent(kevt)) + if (m_cb->HandleWindowEvent(kevt)) // If the event was handled and not skipped then we're done return; @@ -107,21 +103,18 @@ protected: // This will invoke the dialog default action, // such as the clicking the default button. - if (!m_cb->GetEventHandler()->ProcessEvent( event )) + 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() ); event.SetEventObject(def); def->Command(event); - } + } } return; @@ -135,7 +128,7 @@ protected: { event.SetEventObject(m_cb); event.SetId(m_cb->GetId()); - if (! m_cb->GetEventHandler()->ProcessEvent(event)) + if (! m_cb->HandleWindowEvent(event)) event.Skip(); } @@ -143,7 +136,7 @@ protected: { event.SetEventObject(m_cb); event.SetId(m_cb->GetId()); - if (! m_cb->GetEventHandler()->ProcessEvent(event)) + if (! m_cb->HandleWindowEvent(event)) event.Skip(); } @@ -151,7 +144,7 @@ protected: { event.SetEventObject(m_cb); event.SetId(m_cb->GetId()); - if (! m_cb->GetEventHandler()->ProcessEvent(event)) + if (! m_cb->HandleWindowEvent(event)) event.Skip(); } @@ -165,7 +158,7 @@ BEGIN_EVENT_TABLE(wxComboBoxText, wxTextCtrl) EVT_KEY_DOWN(wxComboBoxText::OnKeyDown) EVT_CHAR(wxComboBoxText::OnChar) EVT_KEY_UP(wxComboBoxText::OnKeyUp) - EVT_TEXT(-1, wxComboBoxText::OnText) + EVT_TEXT(wxID_ANY, wxComboBoxText::OnText) END_EVENT_TABLE() class wxComboBoxChoice : public wxChoice @@ -228,14 +221,11 @@ private: }; 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 @@ -337,7 +327,7 @@ void wxComboBox::DelegateChoice( const wxString& value ) void wxComboBox::Init() { - m_container.SetContainerWindow(this); + WX_INIT_CONTROL_CONTAINER(); } bool wxComboBox::Create(wxWindow *parent, @@ -350,10 +340,13 @@ bool wxComboBox::Create(wxWindow *parent, 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, @@ -391,13 +384,10 @@ bool wxComboBox::Create(wxWindow *parent, DoSetSize(pos.x, pos.y, csize.x, csize.y); - for ( int i = 0 ; i < n ; i++ ) - { - m_choice->DoAppend( choices[ i ] ); - } + Append( n, choices ); // Needed because it is a wxControlWithItems - SetBestSize(size); + SetInitialSize(size); SetStringSelection(value); return true; @@ -428,6 +418,16 @@ 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() @@ -471,49 +471,54 @@ 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, unsigned 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(unsigned int n, void* clientData) @@ -526,40 +531,24 @@ void* wxComboBox::DoGetItemClientData(unsigned int n) const return m_choice->DoGetItemClientData( n ) ; } -void wxComboBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData) -{ - return m_choice->DoSetItemClientObject(n, clientData); -} - -wxClientData* wxComboBox::DoGetItemClientObject(unsigned int n) const +wxClientDataType wxComboBox::GetClientDataType() const { - return m_choice->DoGetItemClientObject( n ) ; + return m_choice->GetClientDataType(); } -void wxComboBox::FreeData() +void wxComboBox::SetClientDataType(wxClientDataType clientDataItemsType) { - if ( HasClientObjectData() ) - { - unsigned int count = GetCount(); - for ( unsigned int n = 0; n < count; n++ ) - { - SetClientObject( n, NULL ); - } - } + m_choice->SetClientDataType(clientDataItemsType); } -void wxComboBox::Delete(unsigned int n) +void wxComboBox::DoDeleteOneItem(unsigned int n) { - // force client object deletion - if( HasClientObjectData() ) - SetClientObject( n, NULL ); - m_choice->Delete( n ); + m_choice->DoDeleteOneItem( n ); } -void wxComboBox::Clear() +void wxComboBox::DoClear() { - FreeData(); - m_choice->Clear(); + m_choice->DoClear(); } int wxComboBox::GetSelection() const @@ -572,7 +561,7 @@ 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, bool bCase) const @@ -676,4 +665,4 @@ wxInt32 wxComboBox::MacControlHit( WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENT return noErr ; } -#endif +#endif // wxUSE_COMBOBOX