X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b4ff336e1d719b82ed5e583e470c5d045c21b374..8e6c2840b4149e356350cac7449a96323b4466ec:/src/generic/odcombo.cpp?ds=inline diff --git a/src/generic/odcombo.cpp b/src/generic/odcombo.cpp index 3e62b8349d..83dc7cbb95 100644 --- a/src/generic/odcombo.cpp +++ b/src/generic/odcombo.cpp @@ -33,6 +33,7 @@ #include "wx/dcclient.h" #include "wx/settings.h" #include "wx/dialog.h" + #include "wx/textctrl.h" #endif #include "wx/combo.h" @@ -208,16 +209,15 @@ void wxVListBoxComboPopup::DismissWithEvent() Dismiss(); - wxString valStr; if ( selection != wxNOT_FOUND ) - valStr = m_strings[selection]; + m_stringValue = m_strings[selection]; else - valStr = wxEmptyString; + m_stringValue = wxEmptyString; - m_value = selection; + if ( m_stringValue != m_combo->GetValue() ) + m_combo->SetValueWithEvent(m_stringValue); - if ( valStr != m_combo->GetValue() ) - m_combo->SetValueWithEvent(valStr); + m_value = selection; SendComboBoxEvent(selection); } @@ -246,19 +246,29 @@ void wxVListBoxComboPopup::SendComboBoxEvent( int selection ) // returns true if key was consumed bool wxVListBoxComboPopup::HandleKey( int keycode, bool saturate, wxChar unicode ) { + const int itemCount = GetCount(); + + // keys do nothing in the empty control and returning immediately avoids + // using invalid indices below + if ( !itemCount ) + return false; + int value = m_value; - int itemCount = GetCount(); int comboStyle = m_combo->GetWindowStyle(); // this is the character equivalent of the code - wxChar keychar=0; - if ((keycode >= WXK_SPACE) && (keycode <=255) && (keycode != WXK_DELETE) && wxIsprint(keycode)) + wxChar keychar = 0; + if ( keycode < WXK_START ) { - keychar = (wxChar)keycode; - } - else if (unicode>0) - { - keychar = unicode; + if ( unicode > 0 ) + { + if ( wxIsprint(unicode) ) + keychar = unicode; + } + else if ( wxIsprint(keycode) ) + { + keychar = (wxChar) keycode; + } } if ( keycode == WXK_DOWN || keycode == WXK_RIGHT ) @@ -281,7 +291,7 @@ bool wxVListBoxComboPopup::HandleKey( int keycode, bool saturate, wxChar unicode value-=10; StopPartialCompletion(); } - else if ( comboStyle & wxCB_READONLY ) + else if ( keychar && (comboStyle & wxCB_READONLY) ) { // Try partial completion @@ -471,6 +481,9 @@ void wxVListBoxComboPopup::Insert( const wxString& item, int pos ) } m_strings.Insert(item,pos); + if ( (int)m_clientDatas.size() >= pos ) + m_clientDatas.Insert(NULL, pos); + m_widths.Insert(-1,pos); m_widthsDirty = true; @@ -491,7 +504,7 @@ int wxVListBoxComboPopup::Append(const wxString& item) for ( i=0; i= 0 ) - return m_strings[m_value]; - return wxEmptyString; + return m_stringValue; } void wxVListBoxComboPopup::SetSelection( int item ) @@ -619,6 +629,11 @@ void wxVListBoxComboPopup::SetSelection( int item ) m_value = item; + if ( item >= 0 ) + m_stringValue = m_strings[item]; + else + m_stringValue = wxEmptyString; + if ( IsCreated() ) wxVListBox::SetSelection(item); } @@ -632,10 +647,13 @@ void wxVListBoxComboPopup::SetStringValue( const wxString& value ) { int index = m_strings.Index(value); - m_value = index; + m_stringValue = value; - if ( index >= -1 && index < (int)wxVListBox::GetItemCount() ) + if ( index >= 0 && index < (int)wxVListBox::GetItemCount() ) + { wxVListBox::SetSelection(index); + m_value = index; + } } void wxVListBoxComboPopup::CalcWidths() @@ -742,6 +760,11 @@ wxSize wxVListBoxComboPopup::GetAdjustedSize( int minWidth, int prefHeight, int height = maxHeight; int totalHeight = GetTotalHeight(); // + 3; + + // Take borders into account on Mac or scrollbars always appear +#if defined(__WXMAC__) + totalHeight += 2; +#endif if ( height >= totalHeight ) { height = totalHeight; @@ -923,7 +946,7 @@ void wxOwnerDrawnComboBox::DoSetPopupControl(wxComboPopup* popup) // wxOwnerDrawnComboBox item manipulation methods // ---------------------------------------------------------------------------- -void wxOwnerDrawnComboBox::Clear() +void wxOwnerDrawnComboBox::DoClear() { EnsurePopupControl(); @@ -932,9 +955,9 @@ void wxOwnerDrawnComboBox::Clear() SetValue(wxEmptyString); } -void wxOwnerDrawnComboBox::Delete(unsigned int n) +void wxOwnerDrawnComboBox::DoDeleteOneItem(unsigned int n) { - wxCHECK_RET( IsValid(n), _T("invalid index in wxOwnerDrawnComboBox::Delete") ); + wxCHECK_RET( IsValid(n), wxT("invalid index in wxOwnerDrawnComboBox::Delete") ); if ( GetSelection() == (int) n ) SetValue(wxEmptyString); @@ -952,7 +975,7 @@ unsigned int wxOwnerDrawnComboBox::GetCount() const wxString wxOwnerDrawnComboBox::GetString(unsigned int n) const { - wxCHECK_MSG( IsValid(n), wxEmptyString, _T("invalid index in wxOwnerDrawnComboBox::GetString") ); + wxCHECK_MSG( IsValid(n), wxEmptyString, wxT("invalid index in wxOwnerDrawnComboBox::GetString") ); if ( !m_popupInterface ) return m_initChs.Item(n); @@ -964,7 +987,7 @@ void wxOwnerDrawnComboBox::SetString(unsigned int n, const wxString& s) { EnsurePopupControl(); - wxCHECK_RET( IsValid(n), _T("invalid index in wxOwnerDrawnComboBox::SetString") ); + wxCHECK_RET( IsValid(n), wxT("invalid index in wxOwnerDrawnComboBox::SetString") ); GetVListBoxComboPopup()->SetString(n,s); } @@ -981,7 +1004,7 @@ void wxOwnerDrawnComboBox::Select(int n) { EnsurePopupControl(); - wxCHECK_RET( (n == wxNOT_FOUND) || IsValid(n), _T("invalid index in wxOwnerDrawnComboBox::Select") ); + wxCHECK_RET( (n == wxNOT_FOUND) || IsValid(n), wxT("invalid index in wxOwnerDrawnComboBox::Select") ); GetVListBoxComboPopup()->SetSelection(n); @@ -1006,31 +1029,45 @@ int wxOwnerDrawnComboBox::GetSelection() const return GetVListBoxComboPopup()->GetSelection(); } -int wxOwnerDrawnComboBox::DoAppend(const wxString& item) +int wxOwnerDrawnComboBox::DoInsertItems(const wxArrayStringsAdapter& items, + unsigned int pos, + void **clientData, + wxClientDataType type) { EnsurePopupControl(); - wxASSERT(m_popupInterface); - return GetVListBoxComboPopup()->Append(item); -} + const unsigned int count = items.GetCount(); -int wxOwnerDrawnComboBox::DoInsert(const wxString& item, unsigned int pos) -{ - EnsurePopupControl(); + if ( HasFlag(wxCB_SORT) ) + { + int n = pos; - wxCHECK_MSG(!(GetWindowStyle() & wxCB_SORT), -1, wxT("can't insert into sorted list")); - wxCHECK_MSG(IsValidInsert(pos), -1, wxT("invalid index")); + for ( unsigned int i = 0; i < count; ++i ) + { + n = GetVListBoxComboPopup()->Append(items[i]); + AssignNewItemClientData(n, clientData, i, type); + } - GetVListBoxComboPopup()->Insert(item,pos); + return n; + } + else + { + for ( unsigned int i = 0; i < count; ++i, ++pos ) + { + GetVListBoxComboPopup()->Insert(items[i], pos); + AssignNewItemClientData(pos, clientData, i, type); + } - return pos; + return pos - 1; + } } void wxOwnerDrawnComboBox::DoSetItemClientData(unsigned int n, void* clientData) { EnsurePopupControl(); - GetVListBoxComboPopup()->SetItemClientData(n,clientData,m_clientDataItemsType); + GetVListBoxComboPopup()->SetItemClientData(n, clientData, + GetClientDataType()); } void* wxOwnerDrawnComboBox::DoGetItemClientData(unsigned int n) const @@ -1041,16 +1078,6 @@ void* wxOwnerDrawnComboBox::DoGetItemClientData(unsigned int n) const return GetVListBoxComboPopup()->GetItemClientData(n); } -void wxOwnerDrawnComboBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData) -{ - DoSetItemClientData(n, (void*) clientData); -} - -wxClientData* wxOwnerDrawnComboBox::DoGetItemClientObject(unsigned int n) const -{ - return (wxClientData*) DoGetItemClientData(n); -} - // ---------------------------------------------------------------------------- // wxOwnerDrawnComboBox item drawing and measuring default implementations // ---------------------------------------------------------------------------- @@ -1063,7 +1090,7 @@ void wxOwnerDrawnComboBox::OnDrawItem( wxDC& dc, if ( flags & wxODCB_PAINTING_CONTROL ) { dc.DrawText( GetValue(), - rect.x + GetTextIndent(), + rect.x + GetMargins().x, (rect.height-dc.GetCharHeight())/2 + rect.y ); } else