Reflect changes in stc.cpp in stc.cpp.in from which it's generated.

[wxWidgets.git] / src / generic / odcombo.cpp

diff --git a/src/generic/odcombo.cpp b/src/generic/odcombo.cpp
index 1e9926cd8e74b2b3cad59f56516631b0565fcb48..3a15972c1380fe55e25600bbf1a43510baa1f796 100644 (file)
--- a/src/generic/odcombo.cpp
+++ b/src/generic/odcombo.cpp
@@ -4,7 +4,6 @@
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     Apr-30-2006
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     Apr-30-2006

-// RCS-ID:      $Id$

 // Copyright:   (c) 2005 Jaakko Salli
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2005 Jaakko Salli
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -33,6 +32,7 @@
     #include "wx/dcclient.h"
     #include "wx/settings.h"
     #include "wx/dialog.h"
     #include "wx/dcclient.h"
     #include "wx/settings.h"
     #include "wx/dialog.h"

+    #include "wx/textctrl.h"

 #endif
 
 #include "wx/combo.h"
 #endif
 
 #include "wx/combo.h"


@@ -53,6 +53,7 @@
 BEGIN_EVENT_TABLE(wxVListBoxComboPopup, wxVListBox)
     EVT_MOTION(wxVListBoxComboPopup::OnMouseMove)
     EVT_KEY_DOWN(wxVListBoxComboPopup::OnKey)
 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()
 
     EVT_LEFT_UP(wxVListBoxComboPopup::OnLeftClick)
 END_EVENT_TABLE()
 


@@ -94,6 +95,18 @@ wxVListBoxComboPopup::~wxVListBoxComboPopup()
     Clear();
 }
 
     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
 bool wxVListBoxComboPopup::LazyCreate()
 {
     // NB: There is a bug with wxVListBox that can be avoided by creating


@@ -107,10 +120,16 @@ void wxVListBoxComboPopup::PaintComboControl( wxDC& dc, const wxRect& rect )
 {
     if ( !(m_combo->GetWindowStyle() & wxODCB_STD_CONTROL_PAINT) )
     {
 {
     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 )
         {
         if ( m_value >= 0 )
         {

-            OnDrawItem(dc,rect,m_value,wxODCB_PAINTING_CONTROL);
+            OnDrawItem(dc,rect,m_value,flags);

             return;
         }
     }
             return;
         }
     }


@@ -123,20 +142,27 @@ 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);
 
     // 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 )
     // Set correct text colour for selected items
     if ( wxVListBox::GetSelection() == (int) n )

+    {

         dc.SetTextForeground( wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT) );
         dc.SetTextForeground( wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT) );

+        flags |= wxODCB_PAINTING_SELECTED;
+    }

     else
     else

+    {

         dc.SetTextForeground( wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT) );
         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
 {
     wxOwnerDrawnComboBox* combo = (wxOwnerDrawnComboBox*) m_combo;
 
 }
 
 wxCoord wxVListBoxComboPopup::OnMeasureItem(size_t n) const
 {
     wxOwnerDrawnComboBox* combo = (wxOwnerDrawnComboBox*) m_combo;
 

-    wxASSERT_MSG( combo->IsKindOf(CLASSINFO(wxOwnerDrawnComboBox)),
+    wxASSERT_MSG( wxDynamicCast(combo, wxOwnerDrawnComboBox),

                   wxT("you must subclass wxVListBoxComboPopup for drawing and measuring methods") );
 
     wxCoord h = combo->OnMeasureItem(n);
                   wxT("you must subclass wxVListBoxComboPopup for drawing and measuring methods") );
 
     wxCoord h = combo->OnMeasureItem(n);


@@ -149,7 +175,7 @@ wxCoord wxVListBoxComboPopup::OnMeasureItemWidth(size_t n) const
 {
     wxOwnerDrawnComboBox* combo = (wxOwnerDrawnComboBox*) m_combo;
 
 {
     wxOwnerDrawnComboBox* combo = (wxOwnerDrawnComboBox*) m_combo;
 

-    wxASSERT_MSG( combo->IsKindOf(CLASSINFO(wxOwnerDrawnComboBox)),
+    wxASSERT_MSG( wxDynamicCast(combo, wxOwnerDrawnComboBox),

                   wxT("you must subclass wxVListBoxComboPopup for drawing and measuring methods") );
 
     return combo->OnMeasureItemWidth(n);
                   wxT("you must subclass wxVListBoxComboPopup for drawing and measuring methods") );
 
     return combo->OnMeasureItemWidth(n);


@@ -162,9 +188,12 @@ void wxVListBoxComboPopup::OnDrawBg( wxDC& dc,
 {
     wxOwnerDrawnComboBox* combo = (wxOwnerDrawnComboBox*) m_combo;
 
 {
     wxOwnerDrawnComboBox* combo = (wxOwnerDrawnComboBox*) m_combo;
 

-    wxASSERT_MSG( combo->IsKindOf(CLASSINFO(wxOwnerDrawnComboBox)),
+    wxASSERT_MSG( wxDynamicCast(combo, wxOwnerDrawnComboBox),

                   wxT("you must subclass wxVListBoxComboPopup for drawing and measuring methods") );
 
                   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);
 }
 
     combo->OnDrawBackground(dc,rect,item,flags);
 }
 


@@ -178,7 +207,7 @@ void wxVListBoxComboPopup::OnDrawItem( wxDC& dc, const wxRect& rect, int item, i
 {
     wxOwnerDrawnComboBox* combo = (wxOwnerDrawnComboBox*) m_combo;
 
 {
     wxOwnerDrawnComboBox* combo = (wxOwnerDrawnComboBox*) m_combo;
 

-    wxASSERT_MSG( combo->IsKindOf(CLASSINFO(wxOwnerDrawnComboBox)),
+    wxASSERT_MSG( wxDynamicCast(combo, wxOwnerDrawnComboBox),

                   wxT("you must subclass wxVListBoxComboPopup for drawing and measuring methods") );
 
     combo->OnDrawItem(dc,rect,item,flags);
                   wxT("you must subclass wxVListBoxComboPopup for drawing and measuring methods") );
 
     combo->OnDrawItem(dc,rect,item,flags);


@@ -192,23 +221,22 @@ void wxVListBoxComboPopup::DismissWithEvent()
 
     Dismiss();
 
 
     Dismiss();
 

-    wxString valStr;

     if ( selection != wxNOT_FOUND )
     if ( selection != wxNOT_FOUND )

-        valStr = m_strings[selection];
+        m_stringValue = m_strings[selection];

     else
     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);
 }
 
 void wxVListBoxComboPopup::SendComboBoxEvent( int selection )
 {
 
     SendComboBoxEvent(selection);
 }
 
 void wxVListBoxComboPopup::SendComboBoxEvent( int selection )
 {

-    wxCommandEvent evt(wxEVT_COMMAND_COMBOBOX_SELECTED,m_combo->GetId());
+    wxCommandEvent evt(wxEVT_COMBOBOX,m_combo->GetId());

 
     evt.SetEventObject(m_combo);
 
 
     evt.SetEventObject(m_combo);
 


@@ -228,44 +256,59 @@ void wxVListBoxComboPopup::SendComboBoxEvent( int selection )
 }
 
 // returns true if key was consumed
 }
 
 // returns true if key was consumed

-bool wxVListBoxComboPopup::HandleKey( int keycode, bool saturate, wxChar unicode )
+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 value = m_value;

-    int itemCount = GetCount();

     int comboStyle = m_combo->GetWindowStyle();
 
     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))
+    if ( keychar > 0 )

     {
     {

-        keychar = (wxChar)keycode;
-    }
-    else if (unicode>0)
-    {
-        keychar = unicode; 
+        // 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 )
+    const bool readOnly = (comboStyle & wxCB_READONLY) != 0;
+
+    if ( keycode == WXK_DOWN || keycode == WXK_NUMPAD_DOWN || ( keycode == WXK_RIGHT && readOnly ) )

     {
         value++;
         StopPartialCompletion();
     }
     {
         value++;
         StopPartialCompletion();
     }

-    else if ( keycode == WXK_UP || keycode == WXK_LEFT )
+    else if ( keycode == WXK_UP || keycode == WXK_NUMPAD_UP || ( keycode == WXK_LEFT && readOnly ) )

     {
         value--;
         StopPartialCompletion();
     }
     {
         value--;
         StopPartialCompletion();
     }

-    else if ( keycode == WXK_PAGEDOWN )
+    else if ( keycode == WXK_PAGEDOWN || keycode == WXK_NUMPAD_PAGEDOWN )

     {
         value+=10;
         StopPartialCompletion();
     }
     {
         value+=10;
         StopPartialCompletion();
     }

-    else if ( keycode == WXK_PAGEUP )
+    else if ( keycode == WXK_PAGEUP || keycode == WXK_NUMPAD_PAGEUP )

     {
         value-=10;
         StopPartialCompletion();
     }
     {
         value-=10;
         StopPartialCompletion();
     }

-    else if ( comboStyle && wxCB_READONLY )
+    else if ( ( keycode == WXK_HOME || keycode == WXK_NUMPAD_HOME ) && readOnly )
+    {
+        value=0;
+        StopPartialCompletion();
+    }
+    else if ( ( keycode == WXK_END || keycode == WXK_NUMPAD_END ) && readOnly )
+    {
+        value=itemCount-1;
+        StopPartialCompletion();
+    }
+    else if ( keychar && readOnly )

     {
         // Try partial completion
 
     {
         // Try partial completion
 


@@ -279,12 +322,12 @@ bool wxVListBoxComboPopup::HandleKey( int keycode, bool saturate, wxChar unicode
 
         // now search through the values to see if this is found
         int found = -1;
 
         // now search through the values to see if this is found
         int found = -1;

-        unsigned int length=m_partialCompletionString.Length();
+        unsigned int length=m_partialCompletionString.length();

         int i;
         for (i=0; i<itemCount; i++)
         {
             wxString item=GetString(i);
         int i;
         for (i=0; i<itemCount; i++)
         {
             wxString item=GetString(i);

-            if (( item.Length() >=length) && (!  m_partialCompletionString.CmpNoCase(item.Left(length))))
+            if (( item.length() >= length) && (!  m_partialCompletionString.CmpNoCase(item.Left(length))))

             {
                 found=i;
                 break;
             {
                 found=i;
                 break;


@@ -328,10 +371,14 @@ bool wxVListBoxComboPopup::HandleKey( int keycode, bool saturate, wxChar unicode
         // (good for consistency)
         return true;
 
         // (good for consistency)
         return true;
 

-    m_value = value;
-

     if ( value >= 0 )
     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 occurrence, which may be wrong, so set the index explicitly here,
+    // _after_ the SetValue() call.
+    m_value = value;

 
     SendComboBoxEvent(m_value);
 
 
     SendComboBoxEvent(m_value);
 


@@ -359,13 +406,21 @@ void wxVListBoxComboPopup::OnComboDoubleClick()
 void wxVListBoxComboPopup::OnComboKeyEvent( wxKeyEvent& event )
 {
     // Saturated key movement on
 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
 #if wxUSE_UNICODE

-        event.GetUnicodeKey()
+    const wxChar charcode = event.GetUnicodeKey();

 #else
 #else

-        0
+    const wxChar charcode = (wxChar)event.GetKeyCode();

 #endif
 #endif

-        ) )
+
+    if ( !HandleKey(event.GetKeyCode(), true, charcode) )

         event.Skip();
 }
 
         event.Skip();
 }
 


@@ -390,7 +445,7 @@ void wxVListBoxComboPopup::OnMouseMove(wxMouseEvent& event)
     const size_t lineMax = GetVisibleEnd();
     for ( size_t line = GetVisibleBegin(); line < lineMax; line++ )
     {
     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
         if ( y < 0 )
         {
             // Only change selection if item is fully visible


@@ -410,31 +465,51 @@ void wxVListBoxComboPopup::OnLeftClick(wxMouseEvent& WXUNUSED(event))
 
 void wxVListBoxComboPopup::OnKey(wxKeyEvent& 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
     // 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();
     }
     {
         DismissWithEvent();
     }

-    // Hide popup if ESC is pressed
-    else if ( event.GetKeyCode() == WXK_ESCAPE )
+    else

     {
     {

-        StopPartialCompletion();
-        Dismiss();
+        // completion is handled in OnChar() below
+        event.Skip();

     }
     }

-    else
+}
+
+void wxVListBoxComboPopup::OnChar(wxKeyEvent& event)
+{
+    if ( m_combo->GetWindowStyle() & wxCB_READONLY )

     {
     {

-        int comboStyle = m_combo->GetWindowStyle();
-        int keycode = event.GetKeyCode();
-        // Process partial completion key codes here, but not the arrow keys as the base class will do that for us
-        if ((comboStyle && wxCB_READONLY) &&
-            (keycode >= WXK_SPACE) && (keycode <=255) && (keycode != WXK_DELETE) && wxIsprint(keycode))
+        // 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) )

         {
         {

-            OnComboKeyEvent(event);
+            OnComboCharEvent(event);

             SetSelection(m_value); // ensure the highlight bar moves
             SetSelection(m_value); // ensure the highlight bar moves

+            return; // don't skip the event

         }
         }

-        else
-            event.Skip();

     }
     }

+
+    event.Skip();

 }
 
 void wxVListBoxComboPopup::Insert( const wxString& item, int pos )
 }
 
 void wxVListBoxComboPopup::Insert( const wxString& item, int pos )


@@ -448,6 +523,9 @@ void wxVListBoxComboPopup::Insert( const wxString& item, int pos )
     }
 
     m_strings.Insert(item,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;
 
     m_widths.Insert(-1,pos);
     m_widthsDirty = true;
 


@@ -468,7 +546,7 @@ int wxVListBoxComboPopup::Append(const wxString& item)
 
         for ( i=0; i<strings.GetCount(); i++ )
         {
 
         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;
             {
                 pos = (int)i;
                 break;


@@ -518,7 +596,6 @@ void wxVListBoxComboPopup::SetItemClientData( unsigned int n,
     // It should be sufficient to update this variable only here
     m_clientDataItemsType = clientDataItemsType;
 
     // 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);
     m_clientDatas[n] = clientData;
 
     ItemWidthChanged(n);


@@ -549,8 +626,16 @@ void wxVListBoxComboPopup::Delete( unsigned int item )
     if ( (int)item == m_widestItem )
         m_findWidest = true;
 
     if ( (int)item == m_widestItem )
         m_findWidest = true;
 

+    int sel = GetSelection();
+

     if ( IsCreated() )
         wxVListBox::SetItemCount( wxVListBox::GetItemCount()-1 );
     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
 }
 
 int wxVListBoxComboPopup::FindString(const wxString& s, bool bCase) const


@@ -558,6 +643,16 @@ int wxVListBoxComboPopup::FindString(const wxString& s, bool bCase) const
     return m_strings.Index(s, bCase);
 }
 
     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();
 unsigned int wxVListBoxComboPopup::GetCount() const
 {
     return m_strings.GetCount();


@@ -576,9 +671,7 @@ void wxVListBoxComboPopup::SetString( int item, const wxString& str )
 
 wxString wxVListBoxComboPopup::GetStringValue() const
 {
 
 wxString wxVListBoxComboPopup::GetStringValue() const
 {

-    if ( m_value >= 0 )
-        return m_strings[m_value];
-    return wxEmptyString;
+    return m_stringValue;

 }
 
 void wxVListBoxComboPopup::SetSelection( int item )
 }
 
 void wxVListBoxComboPopup::SetSelection( int item )


@@ -588,6 +681,11 @@ void wxVListBoxComboPopup::SetSelection( int item )
 
     m_value = item;
 
 
     m_value = item;
 

+    if ( item >= 0 )
+        m_stringValue = m_strings[item];
+    else
+        m_stringValue = wxEmptyString;
+

     if ( IsCreated() )
         wxVListBox::SetSelection(item);
 }
     if ( IsCreated() )
         wxVListBox::SetSelection(item);
 }


@@ -601,10 +699,13 @@ void wxVListBoxComboPopup::SetStringValue( const wxString& value )
 {
     int index = m_strings.Index(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);
         wxVListBox::SetSelection(index);

+        m_value = index;
+    }

 }
 
 void wxVListBoxComboPopup::CalcWidths()
 }
 
 void wxVListBoxComboPopup::CalcWidths()


@@ -623,6 +724,8 @@ void wxVListBoxComboPopup::CalcWidths()
         // wxWindow::GetTextExtent (assuming same dc is used
         // for all calls, as we do here).
         wxClientDC dc(m_combo);
         // wxWindow::GetTextExtent (assuming same dc is used
         // for all calls, as we do here).
         wxClientDC dc(m_combo);

+        if ( !m_useFont.IsOk() )
+            m_useFont = m_combo->GetFont();

         dc.SetFont(m_useFont);
 
         for ( i=0; i<n; i++ )
         dc.SetFont(m_useFont);
 
         for ( i=0; i<n; i++ )


@@ -700,6 +803,8 @@ wxSize wxVListBoxComboPopup::GetAdjustedSize( int minWidth, int prefHeight, int
 {
     int height = 250;
 
 {
     int height = 250;
 

+    maxHeight -= 2;  // Must take borders into account
+

     if ( m_strings.GetCount() )
     {
         if ( prefHeight > 0 )
     if ( m_strings.GetCount() )
     {
         if ( prefHeight > 0 )


@@ -709,6 +814,11 @@ wxSize wxVListBoxComboPopup::GetAdjustedSize( int minWidth, int prefHeight, int
             height = maxHeight;
 
         int totalHeight = GetTotalHeight(); // + 3;
             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;
         if ( height >= totalHeight )
         {
             height = totalHeight;


@@ -719,8 +829,7 @@ wxSize wxVListBoxComboPopup::GetAdjustedSize( int minWidth, int prefHeight, int
             // NB: Calculations that take variable height into account
             //     are unnecessary.
             int fih = GetLineHeight(0);
             // 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
         }
     }
     else


@@ -759,7 +868,7 @@ void wxVListBoxComboPopup::Populate( const wxArrayString& choices )
 
     // Find initial selection
     wxString strValue = m_combo->GetValue();
 
     // Find initial selection
     wxString strValue = m_combo->GetValue();

-    if ( strValue.length() )
+    if ( !strValue.empty() )

         m_value = m_strings.Index(strValue);
 }
 
         m_value = m_strings.Index(strValue);
 }
 


@@ -771,9 +880,6 @@ void wxVListBoxComboPopup::Populate( const wxArrayString& choices )
 BEGIN_EVENT_TABLE(wxOwnerDrawnComboBox, wxComboCtrl)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxOwnerDrawnComboBox, wxComboCtrl)
 END_EVENT_TABLE()
 

-
-IMPLEMENT_DYNAMIC_CLASS2(wxOwnerDrawnComboBox, wxComboCtrl, wxControlWithItems)
-

 void wxOwnerDrawnComboBox::Init()
 {
 }
 void wxOwnerDrawnComboBox::Init()
 {
 }


@@ -799,7 +905,6 @@ wxOwnerDrawnComboBox::wxOwnerDrawnComboBox(wxWindow *parent,
                                            long style,
                                            const wxValidator& validator,
                                            const wxString& name)
                                            long style,
                                            const wxValidator& validator,
                                            const wxString& name)

-    : wxComboCtrl()

 {
     Init();
 
 {
     Init();
 


@@ -879,21 +984,28 @@ void wxOwnerDrawnComboBox::DoSetPopupControl(wxComboPopup* popup)
 // wxOwnerDrawnComboBox item manipulation methods
 // ----------------------------------------------------------------------------
 
 // wxOwnerDrawnComboBox item manipulation methods
 // ----------------------------------------------------------------------------
 

-void wxOwnerDrawnComboBox::Clear()
+void wxOwnerDrawnComboBox::DoClear()

 {
     EnsurePopupControl();
 
     GetVListBoxComboPopup()->Clear();
 
 {
     EnsurePopupControl();
 
     GetVListBoxComboPopup()->Clear();
 

+    // NB: This really needs to be SetValue() instead of ChangeValue(),
+    //     as wxTextEntry API expects an event to be sent.

     SetValue(wxEmptyString);
 }
 
     SetValue(wxEmptyString);
 }
 

-void wxOwnerDrawnComboBox::Delete(unsigned int n)
+void wxOwnerDrawnComboBox::Clear()

 {
 {

-    wxCHECK_RET( IsValid(n), _T("invalid index in wxOwnerDrawnComboBox::Delete") );
+    DoClear();
+}
+
+void wxOwnerDrawnComboBox::DoDeleteOneItem(unsigned int n)
+{
+    wxCHECK_RET( IsValid(n), wxT("invalid index in wxOwnerDrawnComboBox::Delete") );

 
     if ( GetSelection() == (int) n )
 
     if ( GetSelection() == (int) n )

-        SetValue(wxEmptyString);
+        ChangeValue(wxEmptyString);

 
     GetVListBoxComboPopup()->Delete(n);
 }
 
     GetVListBoxComboPopup()->Delete(n);
 }


@@ -908,7 +1020,7 @@ unsigned int wxOwnerDrawnComboBox::GetCount() const
 
 wxString wxOwnerDrawnComboBox::GetString(unsigned int n) 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);
 
     if ( !m_popupInterface )
         return m_initChs.Item(n);


@@ -920,7 +1032,7 @@ void wxOwnerDrawnComboBox::SetString(unsigned int n, const wxString& s)
 {
     EnsurePopupControl();
 
 {
     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);
 }
 
     GetVListBoxComboPopup()->SetString(n,s);
 }


@@ -937,7 +1049,7 @@ void wxOwnerDrawnComboBox::Select(int n)
 {
     EnsurePopupControl();
 
 {
     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);
 
 
     GetVListBoxComboPopup()->SetSelection(n);
 


@@ -947,7 +1059,7 @@ void wxOwnerDrawnComboBox::Select(int n)
 
     // Refresh text portion in control
     if ( m_text )
 
     // Refresh text portion in control
     if ( m_text )

-        m_text->SetValue( str );
+        m_text->ChangeValue( str );

     else
         m_valueString = str;
 
     else
         m_valueString = str;
 


@@ -962,31 +1074,50 @@ int wxOwnerDrawnComboBox::GetSelection() const
     return GetVListBoxComboPopup()->GetSelection();
 }
 
     return GetVListBoxComboPopup()->GetSelection();
 }
 

-int wxOwnerDrawnComboBox::DoAppend(const wxString& item)
+void wxOwnerDrawnComboBox::GetSelection(long *from, long *to) const

 {
 {

-    EnsurePopupControl();
-    wxASSERT(m_popupInterface);
-
-    return GetVListBoxComboPopup()->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();
 
 {
     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();

 
 

-    GetVListBoxComboPopup()->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();
 
 }
 
 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
 }
 
 void* wxOwnerDrawnComboBox::DoGetItemClientData(unsigned int n) const


@@ -997,16 +1128,6 @@ void* wxOwnerDrawnComboBox::DoGetItemClientData(unsigned int n) const
     return GetVListBoxComboPopup()->GetItemClientData(n);
 }
 
     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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxOwnerDrawnComboBox item drawing and measuring default implementations
 // ----------------------------------------------------------------------------


@@ -1018,8 +1139,21 @@ void wxOwnerDrawnComboBox::OnDrawItem( wxDC& dc,
 {
     if ( flags & wxODCB_PAINTING_CONTROL )
     {
 {
     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
                      (rect.height-dc.GetCharHeight())/2 + rect.y );
     }
     else


@@ -1038,18 +1172,41 @@ wxCoord wxOwnerDrawnComboBox::OnMeasureItemWidth( size_t WXUNUSED(item) ) const
     return -1;
 }
 
     return -1;
 }
 

-void wxOwnerDrawnComboBox::OnDrawBackground(wxDC& dc, const wxRect& rect, int item, int flags) const
+wxSize wxOwnerDrawnComboBox::DoGetBestSize() const
+{
+    wxSize best( wxComboCtrlBase::DoGetBestSize() );
+
+    if ( GetCount() > 0 )
+    {
+        wxOwnerDrawnComboBox* odc = const_cast<wxOwnerDrawnComboBox*>(this);
+        best.x = odc->GetWidestItemWidth();
+        // TODO: this class may also have GetHightestItemHeight() and
+        // GetHightestItem() methods, and so set the whole (edit part + arrow)
+        // control's height according with this max height, not only max width.
+    }
+
+    return GetSizeFromTextSize(best.x);
+}
+
+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)) )

     {
     {

-        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
 }
 
 #endif // wxUSE_ODCOMBOBOX