X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dc8a1aa53d9c71820d683aefe7ea04d7e480f63b..82ec1f703513f5a09edfea7403481c23fe7b4d1e:/src/generic/odcombo.cpp

diff --git a/src/generic/odcombo.cpp b/src/generic/odcombo.cpp
index cfa07e2ed1..575641d93d 100644
--- a/src/generic/odcombo.cpp
+++ b/src/generic/odcombo.cpp
@@ -107,7 +107,13 @@ 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);
@@ -165,6 +171,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);
 }
 
@@ -201,7 +210,7 @@ void wxVListBoxComboPopup::DismissWithEvent()
     m_value = selection;
 
     if ( valStr != m_combo->GetValue() )
-        m_combo->SetValue(valStr);
+        m_combo->SetValueWithEvent(valStr);
 
     SendComboBoxEvent(selection);
 }
@@ -238,11 +247,11 @@ bool wxVListBoxComboPopup::HandleKey( int keycode, bool saturate, wxChar unicode
     wxChar keychar=0;
     if ((keycode >= WXK_SPACE) && (keycode <=255) && (keycode != WXK_DELETE) && wxIsprint(keycode))
     {
-        keychar = keycode;
+        keychar = (wxChar)keycode;
     }
     else if (unicode>0)
     {
-        keychar = unicode; 
+        keychar = unicode;
     }
 
     if ( keycode == WXK_DOWN || keycode == WXK_RIGHT )
@@ -265,24 +274,26 @@ bool wxVListBoxComboPopup::HandleKey( int keycode, bool saturate, wxChar unicode
         value-=10;
         StopPartialCompletion();
     }
-    else if ( comboStyle && wxCB_READONLY )
+    else if ( 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();
+        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))))
+            if (( item.length() >= length) && (!  m_partialCompletionString.CmpNoCase(item.Left(length))))
             {
                 found=i;
                 break;
@@ -298,7 +309,9 @@ bool wxVListBoxComboPopup::HandleKey( int keycode, bool saturate, wxChar unicode
         else
         {
             value=i;
+#if wxUSE_TIMER
             m_partialCompletionTimer.Start(wxODCB_PARTIAL_COMPLETION_TIME, true);
+#endif // wxUSE_TIMER
         }
     }
     else
@@ -338,7 +351,9 @@ bool wxVListBoxComboPopup::HandleKey( int keycode, bool saturate, wxChar unicode
 void wxVListBoxComboPopup::StopPartialCompletion()
 {
     m_partialCompletionString = wxEmptyString;
+#if wxUSE_TIMER
     m_partialCompletionTimer.Stop();
+#endif // wxUSE_TIMER
 }
 
 void wxVListBoxComboPopup::OnComboDoubleClick()
@@ -404,23 +419,30 @@ void wxVListBoxComboPopup::OnLeftClick(wxMouseEvent& WXUNUSED(event))
 
 void wxVListBoxComboPopup::OnKey(wxKeyEvent& event)
 {
-    // Select item if ENTER is pressed
-    if ( event.GetKeyCode() == WXK_RETURN || event.GetKeyCode() == WXK_NUMPAD_ENTER )
-    {
-        DismissWithEvent();
-    }
-    // Hide popup if ESC is pressed
-    else if ( event.GetKeyCode() == WXK_ESCAPE )
+    // 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
+    else if ( event.GetKeyCode() == WXK_RETURN || event.GetKeyCode() == WXK_NUMPAD_ENTER )
+    {
+        DismissWithEvent();
+    }
     else
     {
         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) &&
+        if ((comboStyle & wxCB_READONLY) &&
             (keycode >= WXK_SPACE) && (keycode <=255) && (keycode != WXK_DELETE) && wxIsprint(keycode))
         {
             OnComboKeyEvent(event);
@@ -543,8 +565,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
@@ -694,6 +724,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 )
@@ -713,8 +745,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
@@ -1032,17 +1063,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) )
+    // 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