Minor cleanup.

[wxWidgets.git] / src / common / combocmn.cpp

diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
index fbad3278429902abe5fa26fed879f7aab04be8d2..cb1ae22dfcef36cb39aae20f0d898eba1e29e70e 100644 (file)
--- a/src/common/combocmn.cpp
+++ b/src/common/combocmn.cpp
@@ -140,7 +140,7 @@ class wxComboFrameEventHandler : public wxEvtHandler
 {
 public:
     wxComboFrameEventHandler( wxComboCtrlBase* pCb );
-    ~wxComboFrameEventHandler();
+    virtual ~wxComboFrameEventHandler();
 
     void OnPopup();
 
@@ -386,7 +386,7 @@ void wxComboPopup::DefaultPaintComboControl( wxComboCtrlBase* combo,
 {
     if ( combo->GetWindowStyle() & wxCB_READONLY ) // ie. no textctrl
     {
-        combo->DrawFocusBackground(dc,rect,0);
+        combo->PrepareBackground(dc,rect,0);
 
         dc.DrawText( combo->GetValue(),
                      rect.x + combo->GetTextIndent(),
@@ -438,7 +438,7 @@ public:
     {
         m_combo = combo;
     }
-    ~wxComboBoxExtraInputHandler() { }
+    virtual ~wxComboBoxExtraInputHandler() { }
     void OnKey(wxKeyEvent& event);
     void OnFocus(wxFocusEvent& event);
 
@@ -510,7 +510,7 @@ public:
         m_combo = combo;
         m_beenInside = false;
     }
-    ~wxComboPopupExtraEventHandler() { }
+    virtual ~wxComboPopupExtraEventHandler() { }
 
     void OnMouseEvent( wxMouseEvent& event );
 
@@ -1036,8 +1036,9 @@ void wxComboCtrlBase::DoSetToolTip(wxToolTip *tooltip)
 // painting
 // ----------------------------------------------------------------------------
 
-// draw focus background on area in a way typical on platform
-void wxComboCtrlBase::DrawFocusBackground( wxDC& dc, const wxRect& rect, int flags ) const
+#if (!defined(__WXMSW__)) || defined(__WXUNIVERSAL__)
+// prepare combo box background on area in a way typical on platform
+void wxComboCtrlBase::PrepareBackground( wxDC& dc, const wxRect& rect, int flags ) const
 {
     wxSize sz = GetClientSize();
     bool isEnabled;
@@ -1106,7 +1107,19 @@ void wxComboCtrlBase::DrawFocusBackground( wxDC& dc, const wxRect& rect, int fla
     dc.SetBrush( bgCol );
     dc.SetPen( bgCol );
     dc.DrawRectangle( selRect );
+
+    // Don't clip exactly to the selection rectangle so we can draw
+    // to the non-selected area in front of it.
+    wxRect clipRect(rect.x,rect.y,
+                    (selRect.x+selRect.width)-rect.x,rect.height);
+    dc.SetClippingRegion(clipRect);
 }
+#else
+// Save the library size a bit for platforms that re-implement this.
+void wxComboCtrlBase::PrepareBackground( wxDC&, const wxRect&, int ) const
+{
+}
+#endif
 
 void wxComboCtrlBase::DrawButton( wxDC& dc, const wxRect& rect, bool paintBg )
 {
@@ -1812,7 +1825,7 @@ void wxComboCtrlBase::OnPopupDismiss()
 
     // If cursor not on dropdown button, then clear its state
     // (technically not required by all ports, but do it for all just in case)
-    if ( !m_btnArea.Inside(ScreenToClient(::wxGetMousePosition())) )
+    if ( !m_btnArea.Contains(ScreenToClient(::wxGetMousePosition())) )
         m_btnState = 0;
 
     // Return parent's tab traversal flag.