X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/788e118f21f73a77c8813caa535a157621ab8fa9..b67c2b8794c60503045b93517b05625755976b95:/src/mac/carbon/combobox.cpp diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp index 7df5846889..196c2e1d3c 100644 --- a/src/mac/carbon/combobox.cpp +++ b/src/mac/carbon/combobox.cpp @@ -42,13 +42,11 @@ MenuHandle NewUniqueMenu() #if TARGET_API_MAC_OSX // margin should be bigger on OS X due to blue highlight // around text control. -static const wxCoord MARGIN = 6; -static const int POPUPWIDTH = 24; +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 POPUPWIDTH = 18; static const int TEXTFOCUSBORDER = 0 ; #endif static const int POPUPHEIGHT = 23; @@ -70,40 +68,30 @@ public: protected: void OnChar( wxKeyEvent& event ) { + // Allows processing the tab key to go to the next control + if (event.GetKeyCode() == WXK_TAB) + { + 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 ( event.GetKeyCode() == WXK_RETURN ) { - wxString value = GetValue(); + wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_cb->GetId()); + event.SetString( GetValue() ); + event.SetInt( m_cb->GetSelection() ); + event.SetEventObject( m_cb ); - 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 ); - } - - // 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() ; @@ -117,7 +105,6 @@ protected: wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() ); event.SetEventObject(def); def->Command(event); - return ; } } @@ -128,6 +115,18 @@ 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 ) + { + wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_cb->GetId()); + event.SetString( GetValue() ); + event.SetEventObject( m_cb ); + m_cb->GetEventHandler()->ProcessEvent(event); + } + } private: wxComboBox *m_cb; @@ -136,6 +135,7 @@ private: BEGIN_EVENT_TABLE(wxComboBoxText, wxTextCtrl) EVT_CHAR( wxComboBoxText::OnChar) + EVT_KEY_UP( wxComboBoxText::OnKeyUp) END_EVENT_TABLE() class wxComboBoxChoice : public wxChoice @@ -146,6 +146,17 @@ public: { m_cb = cb; } + int GetPopupWidth() const + { + switch ( GetWindowVariant() ) + { + case wxWINDOW_VARIANT_NORMAL : + case wxWINDOW_VARIANT_LARGE : + return 24 ; + default : + return 21 ; + } + } protected: void OnChoice( wxCommandEvent& e ) @@ -158,12 +169,19 @@ 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 { wxSize sz = wxChoice::DoGetBestSize() ; if (! m_cb->HasFlag(wxCB_READONLY) ) - sz.x = POPUPWIDTH; + sz.x = GetPopupWidth() ; return sz ; } @@ -211,14 +229,20 @@ wxSize wxComboBox::DoGetBestSize() const wxSize sizeText = m_text->GetBestSize(); if (sizeText.y > size.y) size.y = sizeText.y; - size.x = POPUPWIDTH + sizeText.x + MARGIN; + size.x = m_choice->GetPopupWidth() + sizeText.x + MARGIN; size.x += TEXTFOCUSBORDER ; size.y += 2 * TEXTFOCUSBORDER ; } + else + { + // clipping is too tight + size.y += 1 ; + } 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 ) @@ -229,9 +253,10 @@ void wxComboBox::DoMoveWindow(int x, int y, int width, int height) { } else { - wxCoord wText = width - POPUPWIDTH - MARGIN; + wxCoord wText = width - m_choice->GetPopupWidth() - MARGIN; m_text->SetSize(TEXTFOCUSBORDER, TEXTFOCUSBORDER, wText, -1 ); - m_choice->SetSize(TEXTFOCUSBORDER + wText + MARGIN, TEXTFOCUSBORDER, POPUPWIDTH, -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); } } @@ -359,12 +384,10 @@ int wxComboBox::GetCount() const void wxComboBox::SetValue(const wxString& value) { - int s = FindString (value); - if (s == wxNOT_FOUND && !HasFlag(wxCB_READONLY) ) - { - m_choice->Append(value) ; - } - SetStringSelection( value ) ; + if ( HasFlag(wxCB_READONLY) ) + SetStringSelection( value ) ; + else + m_text->SetValue( value ); } // Clipboard operations @@ -560,11 +583,12 @@ void wxComboBox::SetString(int n, const wxString& s) 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 ; }