X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/118f5fbd0651e6c610a44a42a41dcf93439e820d..33f4afdbc08a2a8b8438420aa9d16aadee0bacc2:/src/generic/odcombo.cpp?ds=sidebyside diff --git a/src/generic/odcombo.cpp b/src/generic/odcombo.cpp index cccd7660f1..9759b33a33 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" @@ -107,10 +108,16 @@ void wxVListBoxComboPopup::PaintComboControl( wxDC& dc, const wxRect& rect ) { if ( !(m_combo->GetWindowStyle() & wxODCB_STD_CONTROL_PAINT) ) { - OnDrawBg(dc,rect,m_value,wxODCB_PAINTING_CONTROL); + int flags = wxODCB_PAINTING_CONTROL; + + if ( m_combo->ShouldDrawFocus() ) + flags |= wxODCB_PAINTING_SELECTED; + + OnDrawBg(dc, rect, m_value, flags); + if ( m_value >= 0 ) { - OnDrawItem(dc,rect,m_value,wxODCB_PAINTING_CONTROL); + OnDrawItem(dc,rect,m_value,flags); return; } } @@ -123,13 +130,20 @@ void wxVListBoxComboPopup::OnDrawItem(wxDC& dc, const wxRect& rect, size_t n) co // TODO: Maybe this code could be moved to wxVListBox::OnPaint? dc.SetFont(m_useFont); + int flags = 0; + // Set correct text colour for selected items if ( wxVListBox::GetSelection() == (int) n ) + { dc.SetTextForeground( wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT) ); + flags |= wxODCB_PAINTING_SELECTED; + } else + { dc.SetTextForeground( wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT) ); + } - OnDrawItem(dc,rect,(int)n,0); + OnDrawItem(dc,rect,(int)n,flags); } wxCoord wxVListBoxComboPopup::OnMeasureItem(size_t n) const @@ -165,6 +179,9 @@ void wxVListBoxComboPopup::OnDrawBg( wxDC& dc, wxASSERT_MSG( combo->IsKindOf(CLASSINFO(wxOwnerDrawnComboBox)), wxT("you must subclass wxVListBoxComboPopup for drawing and measuring methods") ); + if ( IsCurrent((size_t)item) && !(flags & wxODCB_PAINTING_CONTROL) ) + flags |= wxODCB_PAINTING_SELECTED; + combo->OnDrawBackground(dc,rect,item,flags); } @@ -192,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->SetValue(valStr); + m_value = selection; SendComboBoxEvent(selection); } @@ -230,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 ) @@ -265,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 @@ -390,7 +416,7 @@ void wxVListBoxComboPopup::OnMouseMove(wxMouseEvent& event) const size_t lineMax = GetVisibleEnd(); for ( size_t line = GetVisibleBegin(); line < lineMax; line++ ) { - y -= OnGetLineHeight(line); + y -= OnGetRowHeight(line); if ( y < 0 ) { // Only change selection if item is fully visible @@ -455,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; @@ -525,7 +554,6 @@ void wxVListBoxComboPopup::SetItemClientData( unsigned int n, // It should be sufficient to update this variable only here m_clientDataItemsType = clientDataItemsType; - m_clientDatas.SetCount(n+1,NULL); m_clientDatas[n] = clientData; ItemWidthChanged(n); @@ -591,9 +619,7 @@ void wxVListBoxComboPopup::SetString( int item, const wxString& str ) wxString wxVListBoxComboPopup::GetStringValue() const { - if ( m_value >= 0 ) - return m_strings[m_value]; - return wxEmptyString; + return m_stringValue; } void wxVListBoxComboPopup::SetSelection( int item ) @@ -603,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); } @@ -616,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() @@ -715,6 +749,8 @@ wxSize wxVListBoxComboPopup::GetAdjustedSize( int minWidth, int prefHeight, int { int height = 250; + maxHeight -= 2; // Must take borders into account + if ( m_strings.GetCount() ) { if ( prefHeight > 0 ) @@ -734,8 +770,7 @@ wxSize wxVListBoxComboPopup::GetAdjustedSize( int minWidth, int prefHeight, int // NB: Calculations that take variable height into account // are unnecessary. int fih = GetLineHeight(0); - int shown = height/fih; - height = shown * fih; + height -= height % fih; } } else @@ -787,7 +822,19 @@ BEGIN_EVENT_TABLE(wxOwnerDrawnComboBox, wxComboCtrl) END_EVENT_TABLE() +#if wxUSE_EXTENDED_RTTI +IMPLEMENT_DYNAMIC_CLASS2_XTI(wxOwnerDrawnComboBox, wxComboCtrl, wxControlWithItems, "wx/odcombo.h") + +wxBEGIN_PROPERTIES_TABLE(wxOwnerDrawnComboBox) +wxEND_PROPERTIES_TABLE() + +wxBEGIN_HANDLERS_TABLE(wxOwnerDrawnComboBox) +wxEND_HANDLERS_TABLE() + +wxCONSTRUCTOR_5( wxOwnerDrawnComboBox , wxWindow* , Parent , wxWindowID , Id , wxString , Value , wxPoint , Position , wxSize , Size ) +#else IMPLEMENT_DYNAMIC_CLASS2(wxOwnerDrawnComboBox, wxComboCtrl, wxControlWithItems) +#endif void wxOwnerDrawnComboBox::Init() { @@ -894,7 +941,7 @@ void wxOwnerDrawnComboBox::DoSetPopupControl(wxComboPopup* popup) // wxOwnerDrawnComboBox item manipulation methods // ---------------------------------------------------------------------------- -void wxOwnerDrawnComboBox::Clear() +void wxOwnerDrawnComboBox::DoClear() { EnsurePopupControl(); @@ -903,7 +950,7 @@ 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") ); @@ -977,31 +1024,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 ) + { + int 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 @@ -1012,16 +1073,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 // ---------------------------------------------------------------------------- @@ -1053,23 +1104,25 @@ wxCoord wxOwnerDrawnComboBox::OnMeasureItemWidth( size_t WXUNUSED(item) ) const return -1; } -void wxOwnerDrawnComboBox::OnDrawBackground(wxDC& dc, const wxRect& rect, int item, int flags) const +void wxOwnerDrawnComboBox::OnDrawBackground(wxDC& dc, + const wxRect& rect, + int WXUNUSED(item), + int flags) const { - // we need to render selected and current items differently - if ( GetVListBoxComboPopup()->IsCurrent((size_t)item) || - (flags & wxODCB_PAINTING_CONTROL) ) + // We need only to explicitly draw background for items + // that should have selected background. Also, call PrepareBackground + // always when painting the control so that clipping is done properly. + + if ( (flags & wxODCB_PAINTING_SELECTED) || + ((flags & wxODCB_PAINTING_CONTROL) && HasFlag(wxCB_READONLY)) ) { int bgFlags = wxCONTROL_SELECTED; - if ( (flags & wxODCB_PAINTING_CONTROL) != wxODCB_PAINTING_CONTROL ) - { + if ( !(flags & wxODCB_PAINTING_CONTROL) ) bgFlags |= wxCONTROL_ISSUBMENU; - PrepareBackground(dc, rect, bgFlags); - } - else if ( HasFlag(wxCB_READONLY) ) - PrepareBackground(dc, rect, bgFlags); + + PrepareBackground(dc, rect, bgFlags); } - //else: do nothing for the normal items } #endif // wxUSE_ODCOMBOBOX