X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c0f482800af7951308adeaee5072527dd6d5fe5f..c7e94140cd436c6c234a382ad4e16ec5da65830c:/src/generic/odcombo.cpp?ds=sidebyside diff --git a/src/generic/odcombo.cpp b/src/generic/odcombo.cpp index fcd94b3011..06ca2e58a5 100644 --- a/src/generic/odcombo.cpp +++ b/src/generic/odcombo.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: odcombo.cpp +// Name: src/generic/odcombo.cpp // Purpose: wxOwnerDrawnComboBox, wxVListBoxComboPopup // Author: Jaakko Salli // Modified by: @@ -23,7 +23,9 @@ #pragma hdrstop #endif -#if wxUSE_OWNERDRAWNCOMBOBOX +#if wxUSE_ODCOMBOBOX + +#include "wx/odcombo.h" #ifndef WX_PRECOMP #include "wx/log.h" @@ -31,16 +33,17 @@ #include "wx/dcclient.h" #include "wx/settings.h" #include "wx/dialog.h" + #include "wx/textctrl.h" #endif #include "wx/combo.h" -#include "wx/odcombo.h" - // ============================================================================ // implementation // ============================================================================ +// time in milliseconds before partial completion buffer drops +#define wxODCB_PARTIAL_COMPLETION_TIME 1000 // ---------------------------------------------------------------------------- // wxVListBoxComboPopup is a wxVListBox customized to act as a popup control @@ -51,6 +54,7 @@ BEGIN_EVENT_TABLE(wxVListBoxComboPopup, wxVListBox) EVT_MOTION(wxVListBoxComboPopup::OnMouseMove) EVT_KEY_DOWN(wxVListBoxComboPopup::OnKey) + EVT_CHAR(wxVListBoxComboPopup::OnChar) EVT_LEFT_UP(wxVListBoxComboPopup::OnLeftClick) END_EVENT_TABLE() @@ -58,12 +62,14 @@ END_EVENT_TABLE() void wxVListBoxComboPopup::Init() { m_widestWidth = 0; - m_avgCharWidth = 0; - m_baseImageWidth = 0; + m_widestItem = -1; + m_widthsDirty = false; + m_findWidest = false; m_itemHeight = 0; m_value = -1; m_itemHover = -1; m_clientDataItemsType = wxClientData_None; + m_partialCompletionString = wxEmptyString; } bool wxVListBoxComboPopup::Create(wxWindow* parent) @@ -90,6 +96,18 @@ wxVListBoxComboPopup::~wxVListBoxComboPopup() Clear(); } +void wxVListBoxComboPopup::SetFocus() +{ + // Suppress SetFocus() warning by simply not calling it. This combo popup + // has already been designed with the assumption that SetFocus() may not + // do anything useful, so it really doesn't need to be called. +#ifdef __WXMSW__ + // +#else + wxVListBox::SetFocus(); +#endif +} + bool wxVListBoxComboPopup::LazyCreate() { // NB: There is a bug with wxVListBox that can be avoided by creating @@ -103,10 +121,16 @@ void wxVListBoxComboPopup::PaintComboControl( wxDC& dc, const wxRect& rect ) { if ( !(m_combo->GetWindowStyle() & wxODCB_STD_CONTROL_PAINT) ) { - m_combo->DrawFocusBackground(dc,rect,0); + 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,wxCP_PAINTING_CONTROL); + OnDrawItem(dc,rect,m_value,flags); return; } } @@ -119,67 +143,94 @@ 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 WXUNUSED(n)) const +wxCoord wxVListBoxComboPopup::OnMeasureItem(size_t n) const { - return m_itemHeight; + wxOwnerDrawnComboBox* combo = (wxOwnerDrawnComboBox*) m_combo; + + wxASSERT_MSG( combo->IsKindOf(CLASSINFO(wxOwnerDrawnComboBox)), + wxT("you must subclass wxVListBoxComboPopup for drawing and measuring methods") ); + + wxCoord h = combo->OnMeasureItem(n); + if ( h < 0 ) + h = m_itemHeight; + return h; } -wxCoord wxVListBoxComboPopup::OnMeasureItemWidth(size_t WXUNUSED(n)) const +wxCoord wxVListBoxComboPopup::OnMeasureItemWidth(size_t n) const { - //return OnMeasureListItemWidth(n); - return -1; + wxOwnerDrawnComboBox* combo = (wxOwnerDrawnComboBox*) m_combo; + + wxASSERT_MSG( combo->IsKindOf(CLASSINFO(wxOwnerDrawnComboBox)), + wxT("you must subclass wxVListBoxComboPopup for drawing and measuring methods") ); + + return combo->OnMeasureItemWidth(n); +} + +void wxVListBoxComboPopup::OnDrawBg( wxDC& dc, + const wxRect& rect, + int item, + int flags ) const +{ + wxOwnerDrawnComboBox* combo = (wxOwnerDrawnComboBox*) m_combo; + + 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); } void wxVListBoxComboPopup::OnDrawBackground(wxDC& dc, const wxRect& rect, size_t n) const { - // we need to render selected and current items differently - if ( IsCurrent(n) ) - { - m_combo->DrawFocusBackground( dc, rect, wxCONTROL_ISSUBMENU|wxCONTROL_SELECTED ); - } - //else: do nothing for the normal items + OnDrawBg(dc,rect,(int)n,0); } // This is called from wxVListBoxComboPopup::OnDrawItem, with text colour and font prepared void wxVListBoxComboPopup::OnDrawItem( wxDC& dc, const wxRect& rect, int item, int flags ) const { - if ( flags & wxCP_PAINTING_CONTROL ) - { - dc.DrawText( m_combo->GetValue(), - rect.x + m_combo->GetTextIndent(), - (rect.height-dc.GetCharHeight())/2 + rect.y ); - } - else - { - dc.DrawText( GetString(item), rect.x + 2, rect.y ); - } + wxOwnerDrawnComboBox* combo = (wxOwnerDrawnComboBox*) m_combo; + + wxASSERT_MSG( combo->IsKindOf(CLASSINFO(wxOwnerDrawnComboBox)), + wxT("you must subclass wxVListBoxComboPopup for drawing and measuring methods") ); + + combo->OnDrawItem(dc,rect,item,flags); } void wxVListBoxComboPopup::DismissWithEvent() { + StopPartialCompletion(); + int selection = wxVListBox::GetSelection(); 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->SetValueByUser(m_stringValue); - if ( valStr != m_combo->GetValue() ) - m_combo->SetValue(valStr); + m_value = selection; SendComboBoxEvent(selection); } @@ -206,26 +257,95 @@ void wxVListBoxComboPopup::SendComboBoxEvent( int selection ) } // returns true if key was consumed -bool wxVListBoxComboPopup::HandleKey( int keycode, bool saturate ) +bool wxVListBoxComboPopup::HandleKey( int keycode, bool saturate, wxChar keychar ) { + 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(); - if ( keycode == WXK_DOWN || keycode == WXK_RIGHT ) + if ( keychar > 0 ) + { + // we have character equivalent of the keycode; filter out these that + // are not printable characters + if ( !wxIsprint(keychar) ) + keychar = 0; + } + + if ( keycode == WXK_DOWN || keycode == WXK_NUMPAD_DOWN || keycode == WXK_RIGHT ) { value++; + StopPartialCompletion(); } - else if ( keycode == WXK_UP || keycode == WXK_LEFT ) + else if ( keycode == WXK_UP || keycode == WXK_NUMPAD_UP || keycode == WXK_LEFT ) { value--; + StopPartialCompletion(); } - else if ( keycode == WXK_PAGEDOWN ) + else if ( keycode == WXK_PAGEDOWN || keycode == WXK_NUMPAD_PAGEDOWN ) { value+=10; + StopPartialCompletion(); } - else if ( keycode == WXK_PAGEUP ) + else if ( keycode == WXK_PAGEUP || keycode == WXK_NUMPAD_PAGEUP ) { value-=10; + StopPartialCompletion(); + } + else if ( keycode == WXK_HOME || keycode == WXK_NUMPAD_HOME ) + { + value=0; + StopPartialCompletion(); + } + else if ( keycode == WXK_END || keycode == WXK_NUMPAD_END ) + { + value=itemCount-1; + StopPartialCompletion(); + } + else if ( keychar && (comboStyle & wxCB_READONLY) ) + { + // Try partial completion + + // find the new partial completion string +#if wxUSE_TIMER + if (m_partialCompletionTimer.IsRunning()) + m_partialCompletionString+=wxString(keychar); + else +#endif // wxUSE_TIMER + m_partialCompletionString=wxString(keychar); + + // now search through the values to see if this is found + int found = -1; + unsigned int length=m_partialCompletionString.length(); + int i; + for (i=0; i= length) && (! m_partialCompletionString.CmpNoCase(item.Left(length)))) + { + found=i; + break; + } + } + + if (found<0) + { + StopPartialCompletion(); + ::wxBell(); + return true; // to stop the first value being set + } + else + { + value=i; +#if wxUSE_TIMER + m_partialCompletionTimer.Start(wxODCB_PARTIAL_COMPLETION_TIME, true); +#endif // wxUSE_TIMER + } } else return false; @@ -250,16 +370,29 @@ bool wxVListBoxComboPopup::HandleKey( int keycode, bool saturate ) // (good for consistency) return true; - m_value = value; - if ( value >= 0 ) - m_combo->SetValue(m_strings[value]); + m_combo->ChangeValue(m_strings[value]); + + // The m_combo->SetValue() call above sets m_value to the index of this + // string. But if there are more identical string, the index is of the + // first occurence, which may be wrong, so set the index explicitly here, + // _after_ the SetValue() call. + m_value = value; SendComboBoxEvent(m_value); return true; } +// stop partial completion +void wxVListBoxComboPopup::StopPartialCompletion() +{ + m_partialCompletionString = wxEmptyString; +#if wxUSE_TIMER + m_partialCompletionTimer.Stop(); +#endif // wxUSE_TIMER +} + void wxVListBoxComboPopup::OnComboDoubleClick() { // Cycle on dclick (disable saturation to allow true cycling). @@ -272,7 +405,21 @@ void wxVListBoxComboPopup::OnComboDoubleClick() void wxVListBoxComboPopup::OnComboKeyEvent( wxKeyEvent& event ) { // Saturated key movement on - if ( !HandleKey(event.GetKeyCode(),true) ) + if ( !HandleKey(event.GetKeyCode(), true) ) + event.Skip(); +} + +void wxVListBoxComboPopup::OnComboCharEvent( wxKeyEvent& event ) +{ + // unlike in OnComboKeyEvent, wxEVT_CHAR contains meaningful + // printable character information, so pass it +#if wxUSE_UNICODE + const wxChar charcode = event.GetUnicodeKey(); +#else + const wxChar charcode = (wxChar)event.GetKeyCode(); +#endif + + if ( !HandleKey(event.GetKeyCode(), true, charcode) ) event.Skip(); } @@ -284,12 +431,30 @@ void wxVListBoxComboPopup::OnPopup() void wxVListBoxComboPopup::OnMouseMove(wxMouseEvent& event) { + event.Skip(); + // Move selection to cursor if it is inside the popup - int itemHere = GetItemAtPosition(event.GetPosition()); - if ( itemHere >= 0 ) - wxVListBox::SetSelection(itemHere); - event.Skip(); + int y = event.GetPosition().y; + int fromBottom = GetClientSize().y - y; + + // Since in any case we need to find out if the last item is only + // partially visible, we might just as well replicate the HitTest + // loop here. + const size_t lineMax = GetVisibleEnd(); + for ( size_t line = GetVisibleBegin(); line < lineMax; line++ ) + { + y -= OnGetRowHeight(line); + if ( y < 0 ) + { + // Only change selection if item is fully visible + if ( (y + fromBottom) >= 0 ) + { + wxVListBox::SetSelection((int)line); + return; + } + } + } } void wxVListBoxComboPopup::OnLeftClick(wxMouseEvent& WXUNUSED(event)) @@ -299,36 +464,51 @@ void wxVListBoxComboPopup::OnLeftClick(wxMouseEvent& WXUNUSED(event)) void wxVListBoxComboPopup::OnKey(wxKeyEvent& event) { + // Hide popup if certain key or key combination was pressed + if ( m_combo->IsKeyPopupToggle(event) ) + { + StopPartialCompletion(); + Dismiss(); + } + else if ( event.AltDown() ) + { + // On both wxGTK and wxMSW, pressing Alt down seems to + // completely freeze things in popup (ie. arrow keys and + // enter won't work). + return; + } // Select item if ENTER is pressed - if ( event.GetKeyCode() == WXK_RETURN || event.GetKeyCode() == WXK_NUMPAD_ENTER ) + else if ( event.GetKeyCode() == WXK_RETURN || event.GetKeyCode() == WXK_NUMPAD_ENTER ) { DismissWithEvent(); } - // Hide popup if ESC is pressed - else if ( event.GetKeyCode() == WXK_ESCAPE ) - Dismiss(); else + { + // completion is handled in OnChar() below event.Skip(); + } } -void wxVListBoxComboPopup::CheckWidth( int pos ) +void wxVListBoxComboPopup::OnChar(wxKeyEvent& event) { - wxCoord x = OnMeasureItemWidth(pos); - - if ( x < 0 ) + if ( m_combo->GetWindowStyle() & wxCB_READONLY ) { - if ( !m_useFont.Ok() ) - m_useFont = m_combo->GetFont(); - - wxCoord y; - m_combo->GetTextExtent(m_strings[pos], &x, &y, 0, 0, &m_useFont); - x += 4; + // Process partial completion key codes here, but not the arrow keys as + // the base class will do that for us +#if wxUSE_UNICODE + const wxChar charcode = event.GetUnicodeKey(); +#else + const wxChar charcode = (wxChar)event.GetKeyCode(); +#endif + if ( wxIsprint(charcode) ) + { + OnComboCharEvent(event); + SetSelection(m_value); // ensure the highlight bar moves + return; // don't skip the event + } } - if ( m_widestWidth < x ) - { - m_widestWidth = x; - } + event.Skip(); } void wxVListBoxComboPopup::Insert( const wxString& item, int pos ) @@ -342,12 +522,14 @@ 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; if ( IsCreated() ) wxVListBox::SetItemCount( wxVListBox::GetItemCount()+1 ); - - // Calculate width - CheckWidth(pos); } int wxVListBoxComboPopup::Append(const wxString& item) @@ -363,7 +545,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 ) { - // This seems to be necessary (2.5.3 w/ MingW atleast) - if ( item < -1 || item >= (int)m_strings.GetCount() ) - item = -1; + wxCHECK_RET( item == wxNOT_FOUND || ((unsigned int)item < GetCount()), + wxT("invalid index in wxVListBoxComboPopup::SetSelection") ); m_value = item; + if ( item >= 0 ) + m_stringValue = m_strings[item]; + else + m_stringValue = wxEmptyString; + if ( IsCreated() ) wxVListBox::SetSelection(item); } @@ -484,16 +698,110 @@ 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() +{ + bool doFindWidest = m_findWidest; + + // Measure items with dirty width. + if ( m_widthsDirty ) + { + unsigned int i; + unsigned int n = m_widths.GetCount(); + int dirtyHandled = 0; + wxArrayInt& widths = m_widths; + + // I think using wxDC::GetTextExtent is faster than + // wxWindow::GetTextExtent (assuming same dc is used + // for all calls, as we do here). + wxClientDC dc(m_combo); + dc.SetFont(m_useFont); + + for ( i=0; i= m_widestWidth ) + { + m_widestWidth = x; + m_widestItem = (int)i; + } + else if ( (int)i == m_widestItem ) + { + // Width of previously widest item has been decreased, so + // we'll have to check all to find current widest item. + doFindWidest = true; + } + + dirtyHandled++; + } + } + + m_widthsDirty = false; + } + + if ( doFindWidest ) + { + unsigned int i; + unsigned int n = m_widths.GetCount(); + + int bestWidth = -1; + int bestIndex = -1; + + for ( i=0; i bestWidth ) + { + bestIndex = (int)i; + bestWidth = w; + } + } + + m_widestWidth = bestWidth; + m_widestItem = bestIndex; + + m_findWidest = false; + } } wxSize wxVListBoxComboPopup::GetAdjustedSize( int minWidth, int prefHeight, int maxHeight ) { int height = 250; + maxHeight -= 2; // Must take borders into account + if ( m_strings.GetCount() ) { if ( prefHeight > 0 ) @@ -503,6 +811,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; @@ -513,13 +826,14 @@ 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 height = 50; + CalcWidths(); + // Take scrollbar into account in width calculations int widestWidth = m_widestWidth + wxSystemSettings::GetMetric(wxSYS_VSCROLL_X); return wxSize(minWidth > widestWidth ? minWidth : widestWidth, @@ -537,9 +851,11 @@ void wxVListBoxComboPopup::Populate( const wxArrayString& choices ) { const wxString& item = choices.Item(i); m_strings.Add(item); - CheckWidth(i); } + m_widths.SetCount(n,-1); + m_widthsDirty = true; + if ( IsCreated() ) wxVListBox::SetItemCount(n); @@ -549,7 +865,7 @@ void wxVListBoxComboPopup::Populate( const wxArrayString& choices ) // Find initial selection wxString strValue = m_combo->GetValue(); - if ( strValue.Length() ) + if ( !strValue.empty() ) m_value = m_strings.Index(strValue); } @@ -558,15 +874,11 @@ void wxVListBoxComboPopup::Populate( const wxArrayString& choices ) // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(wxOwnerDrawnComboBox, wxComboControl) +BEGIN_EVENT_TABLE(wxOwnerDrawnComboBox, wxComboCtrl) END_EVENT_TABLE() - -IMPLEMENT_DYNAMIC_CLASS2(wxOwnerDrawnComboBox, wxComboControl, wxControlWithItems) - void wxOwnerDrawnComboBox::Init() { - m_popupInterface = NULL; } bool wxOwnerDrawnComboBox::Create(wxWindow *parent, @@ -578,7 +890,7 @@ bool wxOwnerDrawnComboBox::Create(wxWindow *parent, const wxValidator& validator, const wxString& name) { - return wxComboControl::Create(parent,id,value,pos,size,style,validator,name); + return wxComboCtrl::Create(parent,id,value,pos,size,style,validator,name); } wxOwnerDrawnComboBox::wxOwnerDrawnComboBox(wxWindow *parent, @@ -590,7 +902,7 @@ wxOwnerDrawnComboBox::wxOwnerDrawnComboBox(wxWindow *parent, long style, const wxValidator& validator, const wxString& name) - : wxComboControl() + : wxComboCtrl() { Init(); @@ -644,26 +956,24 @@ bool wxOwnerDrawnComboBox::Create(wxWindow *parent, wxOwnerDrawnComboBox::~wxOwnerDrawnComboBox() { if ( m_popupInterface ) - m_popupInterface->ClearClientDatas(); + GetVListBoxComboPopup()->ClearClientDatas(); } -void wxOwnerDrawnComboBox::SetPopupControl( wxComboPopup* popup ) +void wxOwnerDrawnComboBox::DoSetPopupControl(wxComboPopup* popup) { if ( !popup ) { popup = new wxVListBoxComboPopup(); } - wxComboControl::SetPopupControl(popup); + wxComboCtrl::DoSetPopupControl(popup); wxASSERT(popup); - m_popupInterface = (wxVListBoxComboPopup*) popup; // Add initial choices to the wxVListBox - if ( !m_popupInterface->GetCount() ) + if ( !GetVListBoxComboPopup()->GetCount() ) { - //m_popupInterface->Populate(m_initChs.GetCount(),m_initChs.GetStrings()); - m_popupInterface->Populate(m_initChs); + GetVListBoxComboPopup()->Populate(m_initChs); m_initChs.Clear(); } } @@ -672,63 +982,82 @@ void wxOwnerDrawnComboBox::SetPopupControl( wxComboPopup* popup ) // wxOwnerDrawnComboBox item manipulation methods // ---------------------------------------------------------------------------- -void wxOwnerDrawnComboBox::Clear() +void wxOwnerDrawnComboBox::DoClear() { EnsurePopupControl(); - m_popupInterface->Clear(); + GetVListBoxComboPopup()->Clear(); - GetTextCtrl()->SetValue(wxEmptyString); + // NB: This really needs to be SetValue() instead of ChangeValue(), + // as wxTextEntry API expects an event to be sent. + SetValue(wxEmptyString); } -void wxOwnerDrawnComboBox::Delete(unsigned int n) +void wxOwnerDrawnComboBox::Clear() +{ + DoClear(); +} + +void wxOwnerDrawnComboBox::DoDeleteOneItem(unsigned int n) { - wxCHECK_RET( n < GetCount(), _T("invalid index in wxOwnerDrawnComboBox::Delete") ); + wxCHECK_RET( IsValid(n), wxT("invalid index in wxOwnerDrawnComboBox::Delete") ); if ( GetSelection() == (int) n ) - SetValue(wxEmptyString); + ChangeValue(wxEmptyString); - m_popupInterface->Delete(n); + GetVListBoxComboPopup()->Delete(n); } unsigned int wxOwnerDrawnComboBox::GetCount() const { - wxASSERT_MSG( m_popupInterface, wxT("no popup interface") ); - return m_popupInterface->GetCount(); + if ( !m_popupInterface ) + return m_initChs.GetCount(); + + return GetVListBoxComboPopup()->GetCount(); } wxString wxOwnerDrawnComboBox::GetString(unsigned int n) const { - wxCHECK_MSG( n < GetCount(), wxEmptyString, _T("invalid index in wxOwnerDrawnComboBox::GetString") ); - return m_popupInterface->GetString(n); + wxCHECK_MSG( IsValid(n), wxEmptyString, wxT("invalid index in wxOwnerDrawnComboBox::GetString") ); + + if ( !m_popupInterface ) + return m_initChs.Item(n); + + return GetVListBoxComboPopup()->GetString(n); } void wxOwnerDrawnComboBox::SetString(unsigned int n, const wxString& s) { - wxCHECK_RET( n < GetCount(), _T("invalid index in wxOwnerDrawnComboBox::SetString") ); - m_popupInterface->SetString(n,s); + EnsurePopupControl(); + + wxCHECK_RET( IsValid(n), wxT("invalid index in wxOwnerDrawnComboBox::SetString") ); + + GetVListBoxComboPopup()->SetString(n,s); } -int wxOwnerDrawnComboBox::FindString(const wxString& s) const +int wxOwnerDrawnComboBox::FindString(const wxString& s, bool bCase) const { - wxASSERT_MSG( m_popupInterface, wxT("no popup interface") ); - return m_popupInterface->FindString(s); + if ( !m_popupInterface ) + return m_initChs.Index(s, bCase); + + return GetVListBoxComboPopup()->FindString(s, bCase); } void wxOwnerDrawnComboBox::Select(int n) { - wxCHECK_RET( (n >= -1) && (n < (int)GetCount()), _T("invalid index in wxOwnerDrawnComboBox::Select") ); EnsurePopupControl(); - m_popupInterface->SetSelection(n); + wxCHECK_RET( (n == wxNOT_FOUND) || IsValid(n), wxT("invalid index in wxOwnerDrawnComboBox::Select") ); + + GetVListBoxComboPopup()->SetSelection(n); wxString str; if ( n >= 0 ) - str = m_popupInterface->GetString(n); + str = GetVListBoxComboPopup()->GetString(n); // Refresh text portion in control if ( m_text ) - m_text->SetValue( str ); + m_text->ChangeValue( str ); else m_valueString = str; @@ -737,48 +1066,129 @@ void wxOwnerDrawnComboBox::Select(int n) int wxOwnerDrawnComboBox::GetSelection() const { - wxASSERT_MSG( m_popupInterface, wxT("no popup interface") ); - return m_popupInterface->GetSelection(); + if ( !m_popupInterface ) + return m_initChs.Index(m_valueString); + + return GetVListBoxComboPopup()->GetSelection(); } -int wxOwnerDrawnComboBox::DoAppend(const wxString& item) +void wxOwnerDrawnComboBox::GetSelection(long *from, long *to) const { - EnsurePopupControl(); - wxASSERT(m_popupInterface); - return m_popupInterface->Append(item); + wxComboCtrl::GetSelection(from, to); } -int wxOwnerDrawnComboBox::DoInsert(const wxString& item, unsigned int pos) +int wxOwnerDrawnComboBox::DoInsertItems(const wxArrayStringsAdapter& items, + unsigned int pos, + void **clientData, + wxClientDataType type) { - wxCHECK_MSG(!(GetWindowStyle() & wxCB_SORT), -1, wxT("can't insert into sorted list")); - wxCHECK_MSG(pos<=GetCount(), -1, wxT("invalid index")); - EnsurePopupControl(); - m_popupInterface->Insert(item,pos); - return pos; + const unsigned int count = items.GetCount(); + + if ( HasFlag(wxCB_SORT) ) + { + int n = pos; + + for ( unsigned int i = 0; i < count; ++i ) + { + n = GetVListBoxComboPopup()->Append(items[i]); + AssignNewItemClientData(n, clientData, i, type); + } + + return n; + } + else + { + for ( unsigned int i = 0; i < count; ++i, ++pos ) + { + GetVListBoxComboPopup()->Insert(items[i], pos); + AssignNewItemClientData(pos, clientData, i, type); + } + + return pos - 1; + } } void wxOwnerDrawnComboBox::DoSetItemClientData(unsigned int n, void* clientData) { EnsurePopupControl(); - m_popupInterface->SetItemClientData(n,clientData,m_clientDataItemsType); + + GetVListBoxComboPopup()->SetItemClientData(n, clientData, + GetClientDataType()); } void* wxOwnerDrawnComboBox::DoGetItemClientData(unsigned int n) const { - wxASSERT_MSG( m_popupInterface, wxT("no popup interface") ); - return m_popupInterface->GetItemClientData(n); + if ( !m_popupInterface ) + return NULL; + + return GetVListBoxComboPopup()->GetItemClientData(n); +} + +// ---------------------------------------------------------------------------- +// wxOwnerDrawnComboBox item drawing and measuring default implementations +// ---------------------------------------------------------------------------- + +void wxOwnerDrawnComboBox::OnDrawItem( wxDC& dc, + const wxRect& rect, + int item, + int flags ) const +{ + if ( flags & wxODCB_PAINTING_CONTROL ) + { + wxString text; + + if ( !ShouldUseHintText() ) + { + text = GetValue(); + } + else + { + text = GetHint(); + wxColour col = wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT); + dc.SetTextForeground(col); + } + + dc.DrawText( text, + rect.x + GetMargins().x, + (rect.height-dc.GetCharHeight())/2 + rect.y ); + } + else + { + dc.DrawText( GetVListBoxComboPopup()->GetString(item), rect.x + 2, rect.y ); + } } -void wxOwnerDrawnComboBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData) +wxCoord wxOwnerDrawnComboBox::OnMeasureItem( size_t WXUNUSED(item) ) const { - DoSetItemClientData(n, (void*) clientData); + return -1; } -wxClientData* wxOwnerDrawnComboBox::DoGetItemClientObject(unsigned int n) const +wxCoord wxOwnerDrawnComboBox::OnMeasureItemWidth( size_t WXUNUSED(item) ) const { - return (wxClientData*) DoGetItemClientData(n); + return -1; +} + +void wxOwnerDrawnComboBox::OnDrawBackground(wxDC& dc, + const wxRect& rect, + int WXUNUSED(item), + int flags) const +{ + // 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) ) + bgFlags |= wxCONTROL_ISSUBMENU; + + PrepareBackground(dc, rect, bgFlags); + } } -#endif // wxUSE_OWNERDRAWNCOMBOBOX +#endif // wxUSE_ODCOMBOBOX