X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/30a936ee4eb950b4b1905b6bd09c90d3ec39fa99..df7998fce5569c46a0f14456966adcef6521efc9:/src/mac/carbon/combobox.cpp?ds=sidebyside diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp index f18e9ec3fa..0241b689ac 100644 --- a/src/mac/carbon/combobox.cpp +++ b/src/mac/carbon/combobox.cpp @@ -9,24 +9,26 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#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" #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++ ; @@ -68,40 +70,38 @@ public: protected: void OnChar( wxKeyEvent& event ) { - if ( event.GetKeyCode() == WXK_RETURN ) + // Allows processing the tab key to go to the next control + if (event.GetKeyCode() == WXK_TAB) { - wxString value = GetValue(); + wxNavigationKeyEvent NavEvent; + NavEvent.SetEventObject(this); + NavEvent.SetDirection(true); + NavEvent.SetWindowChange(false); + + // Get the parent of the combo and have it process the navigation? + if (m_cb->GetParent()->GetEventHandler()->ProcessEvent(NavEvent)) + return; + } - if ( m_cb->GetCount() == 0 ) - { - // make Enter generate "selected" event if there is only one item - // in the combobox - without it, it's impossible to select it at - // all! - wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, m_cb->GetId() ); - event.SetInt( 0 ); - event.SetString( value ); - event.SetEventObject( m_cb ); - m_cb->GetEventHandler()->ProcessEvent( event ); - } - else - { - // add the item to the list if it's not there yet - if ( m_cb->FindString(value) == wxNOT_FOUND ) - { - m_cb->Append(value); - m_cb->SetStringSelection(value); - - // and generate the selected event for it - wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, m_cb->GetId() ); - event.SetInt( m_cb->GetCount() - 1 ); - event.SetString( value ); - event.SetEventObject( m_cb ); - m_cb->GetEventHandler()->ProcessEvent( event ); - } + // 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 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()); + event.SetString( GetValue() ); + event.SetInt( m_cb->GetSelection() ); + event.SetEventObject( m_cb ); - // This will invoke the dialog default action, such - // as the clicking the default button. + // This will invoke the dialog default action, such + // as the clicking the default button. + if (!m_cb->GetEventHandler()->ProcessEvent( event )) + { wxWindow *parent = GetParent(); while( parent && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL ) { parent = parent->GetParent() ; @@ -115,17 +115,40 @@ protected: wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() ); event.SetEventObject(def); def->Command(event); - return ; } } return; } } - + event.Skip(); } + void OnKeyUp( wxKeyEvent& event ) + { + event.SetEventObject(m_cb); + event.SetId(m_cb->GetId()); + if (! m_cb->GetEventHandler()->ProcessEvent(event)) + event.Skip(); + } + + void OnKeyDown( wxKeyEvent& event ) + { + event.SetEventObject(m_cb); + event.SetId(m_cb->GetId()); + if (! m_cb->GetEventHandler()->ProcessEvent(event)) + event.Skip(); + } + + void OnText( wxCommandEvent& event ) + { + event.SetEventObject(m_cb); + event.SetId(m_cb->GetId()); + if (! m_cb->GetEventHandler()->ProcessEvent(event)) + event.Skip(); + } + private: wxComboBox *m_cb; @@ -133,14 +156,17 @@ private: }; BEGIN_EVENT_TABLE(wxComboBoxText, wxTextCtrl) - EVT_CHAR( wxComboBoxText::OnChar) + EVT_KEY_DOWN( wxComboBoxText::OnKeyDown) + EVT_CHAR( wxComboBoxText::OnChar) + EVT_KEY_UP( wxComboBoxText::OnKeyUp) + EVT_TEXT( -1, wxComboBoxText::OnText) END_EVENT_TABLE() class wxComboBoxChoice : public wxChoice { public: wxComboBoxChoice(wxComboBox *cb, int style) - : wxChoice( cb , 1 ) + : wxChoice( cb , 1 , wxDefaultPosition , wxDefaultSize , 0 , NULL , style & (wxCB_SORT) ) { m_cb = cb; } @@ -167,6 +193,13 @@ protected: event2.SetEventObject(m_cb); event2.SetString(m_cb->GetStringSelection()); m_cb->ProcessCommand(event2); + + // For consistency with MSW and GTK, also send a text updated event + // After all, the text is updated when a selection is made + wxCommandEvent TextEvent( wxEVT_COMMAND_TEXT_UPDATED, m_cb->GetId() ); + TextEvent.SetString( m_cb->GetStringSelection() ); + TextEvent.SetEventObject( m_cb ); + m_cb->ProcessCommand( TextEvent ); } virtual wxSize DoGetBestSize() const { @@ -174,7 +207,7 @@ protected: if (! m_cb->HasFlag(wxCB_READONLY) ) sz.x = GetPopupWidth() ; return sz ; - } + } private: wxComboBox *m_cb; @@ -214,7 +247,7 @@ wxSize wxComboBox::DoGetBestSize() const if (!m_choice && !m_text) return GetSize(); wxSize size = m_choice->GetBestSize(); - + if ( m_text != NULL ) { wxSize sizeText = m_text->GetBestSize(); @@ -232,10 +265,10 @@ wxSize wxComboBox::DoGetBestSize() const return size; } -void wxComboBox::DoMoveWindow(int x, int y, int width, int height) +void wxComboBox::DoMoveWindow(int x, int y, int width, int height) { wxControl::DoMoveWindow(x, y, width , height ); - + if ( m_text == NULL ) { // we might not be fully constructed yet, therefore watch out... @@ -248,7 +281,7 @@ void wxComboBox::DoMoveWindow(int x, int y, int width, int height) 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); - } + } } @@ -260,17 +293,20 @@ void wxComboBox::DoMoveWindow(int x, int y, int width, int height) bool wxComboBox::Enable(bool enable) { if ( !wxControl::Enable(enable) ) - return FALSE; + return false; + + if (m_text) + m_text->Enable(enable); - return TRUE; + return true; } bool wxComboBox::Show(bool show) { if ( !wxControl::Show(show) ) - return FALSE; + return false; - return TRUE; + return true; } void wxComboBox::SetFocus() @@ -319,9 +355,9 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, const wxString& name) { if ( !wxControl::Create(parent, id, wxDefaultPosition, wxDefaultSize, style , - wxDefaultValidator, name) ) + validator, name) ) { - return FALSE; + return false; } m_choice = new wxComboBoxChoice(this, style ); @@ -333,29 +369,30 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, else { m_text = new wxComboBoxText(this); - if ( size.y == -1 ) + if ( size.y == -1 ) { csize.y = m_text->GetSize().y ; csize.y += 2 * TEXTFOCUSBORDER ; } } - + DoSetSize(pos.x, pos.y, csize.x, csize.y); - + for ( int i = 0 ; i < n ; i++ ) { m_choice->DoAppend( choices[ i ] ); } SetBestSize(size); // Needed because it is a wxControlWithItems - - return TRUE; + SetStringSelection(value); + + return true; } wxString wxComboBox::GetValue() const { wxString result; - + if ( m_text == NULL ) { result = m_choice->GetString( m_choice->GetSelection() ); @@ -369,8 +406,8 @@ wxString wxComboBox::GetValue() const } int wxComboBox::GetCount() const -{ - return m_choice->GetCount() ; +{ + return m_choice->GetCount() ; } void wxComboBox::SetValue(const wxString& value) @@ -420,7 +457,7 @@ void wxComboBox::SetEditable(bool editable) int currentX, currentY; GetPosition( ¤tX, ¤tY ); - + int currentW, currentH; GetSize( ¤tW, ¤tH ); @@ -443,7 +480,7 @@ long wxComboBox::GetInsertionPoint() const return 0; } -long wxComboBox::GetLastPosition() const +wxTextPos wxComboBox::GetLastPosition() const { // TODO return 0; @@ -464,17 +501,17 @@ 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, int pos) { return m_choice->DoInsert( item , pos ) ; } -void wxComboBox::DoSetItemClientData(int n, void* clientData) +void wxComboBox::DoSetItemClientData(int n, void* clientData) { return m_choice->DoSetItemClientData( n , clientData ) ; } @@ -489,7 +526,7 @@ void wxComboBox::DoSetItemClientObject(int n, wxClientData* clientData) return m_choice->DoSetItemClientObject( n , clientData ) ; } -wxClientData* wxComboBox::DoGetItemClientObject(int n) const +wxClientData* wxComboBox::DoGetItemClientObject(int n) const { return m_choice->DoGetItemClientObject( n ) ; } @@ -528,7 +565,7 @@ int wxComboBox::GetSelection() const void wxComboBox::SetSelection(int n) { m_choice->SetSelection( n ); - + if ( m_text != NULL ) { m_text->SetValue( GetString( n ) ); @@ -554,31 +591,83 @@ wxString wxComboBox::GetStringSelection() const return wxEmptyString; } -bool wxComboBox::SetStringSelection(const wxString& sel) +void wxComboBox::SetString(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; +} -wxInt32 wxComboBox::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) ) +bool wxComboBox::CanUndo() const { + if (m_text != NULL) + return m_text->CanUndo(); + else + return false; +} + +bool wxComboBox::CanRedo() const +{ + if (m_text != NULL) + return m_text->CanRedo(); + else + return false; +} + +wxInt32 wxComboBox::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) ) +{ + /* 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