X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e5d633423892080a29d08c6f7f13a562a9aa3db3..04fa04d8067d235ab45b5bc05b65f0679634b541:/src/generic/odcombo.cpp

diff --git a/src/generic/odcombo.cpp b/src/generic/odcombo.cpp
index 1a1f2e74e4..6425dd145d 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"
@@ -41,6 +42,8 @@
 // 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()
 
@@ -65,6 +69,7 @@ void wxVListBoxComboPopup::Init()
     m_value = -1;
     m_itemHover = -1;
     m_clientDataItemsType = wxClientData_None;
+    m_partialCompletionString = wxEmptyString;
 }
 
 bool wxVListBoxComboPopup::Create(wxWindow* parent)
@@ -91,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
@@ -104,10 +121,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;
         }
     }
@@ -120,13 +143,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
@@ -162,6 +192,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);
 }
 
@@ -183,20 +216,21 @@ void wxVListBoxComboPopup::OnDrawItem( wxDC& dc, const wxRect& rect, int item, i
 
 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);
 }
@@ -223,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 ( 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_RIGHT )
+    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<itemCount; i++)
+        {
+            wxString item=GetString(i);
+            if (( item.length() >= 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;
@@ -267,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).
@@ -289,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();
 }
 
@@ -301,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))
@@ -316,16 +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::OnChar(wxKeyEvent& event)
+{
+    if ( m_combo->GetWindowStyle() & wxCB_READONLY )
+    {
+        // 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
+        }
+    }
+
+    event.Skip();
 }
 
 void wxVListBoxComboPopup::Insert( const wxString& item, int pos )
@@ -339,6 +522,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;
 
@@ -359,7 +545,7 @@ int wxVListBoxComboPopup::Append(const wxString& item)
 
         for ( i=0; i<strings.GetCount(); i++ )
         {
-            if ( item.Cmp(strings.Item(i)) < 0 )
+            if ( item.CmpNoCase(strings.Item(i)) <= 0 )
             {
                 pos = (int)i;
                 break;
@@ -409,7 +595,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);
@@ -440,8 +625,16 @@ void wxVListBoxComboPopup::Delete( unsigned int item )
     if ( (int)item == m_widestItem )
         m_findWidest = true;
 
+    int sel = GetSelection();
+
     if ( IsCreated() )
         wxVListBox::SetItemCount( wxVListBox::GetItemCount()-1 );
+
+    // Fix selection
+    if ( (int)item < sel )
+        SetSelection(sel-1);
+    else if ( (int)item == sel )
+        SetSelection(wxNOT_FOUND);
 }
 
 int wxVListBoxComboPopup::FindString(const wxString& s, bool bCase) const
@@ -449,6 +642,16 @@ int wxVListBoxComboPopup::FindString(const wxString& s, bool bCase) const
     return m_strings.Index(s, bCase);
 }
 
+bool wxVListBoxComboPopup::FindItem(const wxString& item, wxString* trueItem)
+{
+    int idx = m_strings.Index(item, false);
+    if ( idx == wxNOT_FOUND )
+        return false;
+    if ( trueItem != NULL )
+        *trueItem = m_strings[idx];
+    return true;
+}
+
 unsigned int wxVListBoxComboPopup::GetCount() const
 {
     return m_strings.GetCount();
@@ -467,9 +670,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 )
@@ -479,6 +680,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);
 }
@@ -492,42 +698,17 @@ 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;
+    }
 }
 
-wxSize wxVListBoxComboPopup::GetAdjustedSize( int minWidth, int prefHeight, int maxHeight )
+void wxVListBoxComboPopup::CalcWidths()
 {
-    int height = 250;
-
-    if ( m_strings.GetCount() )
-    {
-        if ( prefHeight > 0 )
-            height = prefHeight;
-
-        if ( height > maxHeight )
-            height = maxHeight;
-
-        int totalHeight = GetTotalHeight(); // + 3;
-        if ( height >= totalHeight )
-        {
-            height = totalHeight;
-        }
-        else
-        {
-            // Adjust height to a multiple of the height of the first item
-            // NB: Calculations that take variable height into account
-            //     are unnecessary.
-            int fih = GetLineHeight(0);
-            int shown = height/fih;
-            height = shown * fih;
-        }
-    }
-    else
-        height = 50;
-
     bool doFindWidest = m_findWidest;
 
     // Measure items with dirty width.
@@ -613,6 +794,45 @@ wxSize wxVListBoxComboPopup::GetAdjustedSize( int minWidth, int prefHeight, int
 
         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 )
+            height = prefHeight;
+
+        if ( height > maxHeight )
+            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;
+        }
+        else
+        {
+            // Adjust height to a multiple of the height of the first item
+            // NB: Calculations that take variable height into account
+            //     are unnecessary.
+            int fih = GetLineHeight(0);
+            height -= height % fih;
+        }
+    }
+    else
+        height = 50;
+
+    CalcWidths();
 
     // Take scrollbar into account in width calculations
     int widestWidth = m_widestWidth + wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
@@ -645,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);
 }
 
@@ -657,12 +877,8 @@ void wxVListBoxComboPopup::Populate( const wxArrayString& choices )
 BEGIN_EVENT_TABLE(wxOwnerDrawnComboBox, wxComboCtrl)
 END_EVENT_TABLE()
 
-
-IMPLEMENT_DYNAMIC_CLASS2(wxOwnerDrawnComboBox, wxComboCtrl, wxControlWithItems)
-
 void wxOwnerDrawnComboBox::Init()
 {
-    m_popupInterface = NULL;
 }
 
 bool wxOwnerDrawnComboBox::Create(wxWindow *parent,
@@ -686,7 +902,6 @@ wxOwnerDrawnComboBox::wxOwnerDrawnComboBox(wxWindow *parent,
                                            long style,
                                            const wxValidator& validator,
                                            const wxString& name)
-    : wxComboCtrl()
 {
     Init();
 
@@ -740,7 +955,7 @@ bool wxOwnerDrawnComboBox::Create(wxWindow *parent,
 wxOwnerDrawnComboBox::~wxOwnerDrawnComboBox()
 {
     if ( m_popupInterface )
-        m_popupInterface->ClearClientDatas();
+        GetVListBoxComboPopup()->ClearClientDatas();
 }
 
 void wxOwnerDrawnComboBox::DoSetPopupControl(wxComboPopup* popup)
@@ -753,13 +968,11 @@ void wxOwnerDrawnComboBox::DoSetPopupControl(wxComboPopup* 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();
     }
 }
@@ -768,23 +981,30 @@ void wxOwnerDrawnComboBox::DoSetPopupControl(wxComboPopup* popup)
 // wxOwnerDrawnComboBox item manipulation methods
 // ----------------------------------------------------------------------------
 
-void wxOwnerDrawnComboBox::Clear()
+void wxOwnerDrawnComboBox::DoClear()
 {
     EnsurePopupControl();
 
-    m_popupInterface->Clear();
+    GetVListBoxComboPopup()->Clear();
 
+    // 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( IsValid(n), _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
@@ -792,26 +1012,26 @@ unsigned int wxOwnerDrawnComboBox::GetCount() const
     if ( !m_popupInterface )
         return m_initChs.GetCount();
 
-    return m_popupInterface->GetCount();
+    return GetVListBoxComboPopup()->GetCount();
 }
 
 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);
 
-    return m_popupInterface->GetString(n);
+    return GetVListBoxComboPopup()->GetString(n);
 }
 
 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") );
 
-    m_popupInterface->SetString(n,s);
+    GetVListBoxComboPopup()->SetString(n,s);
 }
 
 int wxOwnerDrawnComboBox::FindString(const wxString& s, bool bCase) const
@@ -819,24 +1039,24 @@ int wxOwnerDrawnComboBox::FindString(const wxString& s, bool bCase) const
     if ( !m_popupInterface )
         return m_initChs.Index(s, bCase);
 
-    return m_popupInterface->FindString(s, bCase);
+    return GetVListBoxComboPopup()->FindString(s, bCase);
 }
 
 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") );
 
-    m_popupInterface->SetSelection(n);
+    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;
 
@@ -848,32 +1068,53 @@ int wxOwnerDrawnComboBox::GetSelection() const
     if ( !m_popupInterface )
         return m_initChs.Index(m_valueString);
 
-    return m_popupInterface->GetSelection();
+    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)
 {
     EnsurePopupControl();
 
-    wxCHECK_MSG(!(GetWindowStyle() & wxCB_SORT), -1, wxT("can't insert into sorted list"));
-    wxCHECK_MSG(IsValidInsert(pos), -1, wxT("invalid index"));
+    const unsigned int count = items.GetCount();
 
-    m_popupInterface->Insert(item,pos);
+    if ( HasFlag(wxCB_SORT) )
+    {
+        int n = pos;
 
-    return 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
@@ -881,17 +1122,7 @@ void* wxOwnerDrawnComboBox::DoGetItemClientData(unsigned int n) const
     if ( !m_popupInterface )
         return NULL;
 
-    return m_popupInterface->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);
+    return GetVListBoxComboPopup()->GetItemClientData(n);
 }
 
 // ----------------------------------------------------------------------------
@@ -905,13 +1136,26 @@ void wxOwnerDrawnComboBox::OnDrawItem( wxDC& dc,
 {
     if ( flags & wxODCB_PAINTING_CONTROL )
     {
-        dc.DrawText( GetValue(),
-                     rect.x + GetTextIndent(),
+        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( m_popupInterface->GetString(item), rect.x + 2, rect.y );
+        dc.DrawText( GetVListBoxComboPopup()->GetString(item), rect.x + 2, rect.y );
     }
 }
 
@@ -925,17 +1169,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 ( m_popupInterface->IsCurrent((size_t)item) )
+    // 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)) )
     {
-        DrawFocusBackground(dc,
-                            rect,
-                            (flags&wxODCB_PAINTING_CONTROL?0:wxCONTROL_ISSUBMENU) |
-                            wxCONTROL_SELECTED);
+        int bgFlags = wxCONTROL_SELECTED;
+
+        if ( !(flags & wxODCB_PAINTING_CONTROL) )
+            bgFlags |= wxCONTROL_ISSUBMENU;
+
+        PrepareBackground(dc, rect, bgFlags);
     }
-    //else: do nothing for the normal items
 }
 
 #endif // wxUSE_ODCOMBOBOX