don't take EVT_HEADER_END_DRAG into account if it indicates the the drag was cancelled

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

diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp
index 5ad90db583eccaa25daf9cd5cb9e098753866924..0a8193808b170629d096f67da563e9f861468e1d 100644 (file)
--- a/src/generic/renderg.cpp
+++ b/src/generic/renderg.cpp
@@ -98,6 +98,8 @@ public:
                               const wxRect& rect,
                               int flags = 0);
 
                               const wxRect& rect,
                               int flags = 0);
 

+    virtual wxSize GetCheckBoxSize(wxWindow *win);
+

     virtual void DrawPushButton(wxWindow *win,
                                 wxDC& dc,
                                 const wxRect& rect,
     virtual void DrawPushButton(wxWindow *win,
                                 wxDC& dc,
                                 const wxRect& rect,


@@ -618,6 +620,11 @@ wxRendererGeneric::DrawCheckBox(wxWindow *WXUNUSED(win),
     }
 }
 
     }
 }
 

+wxSize wxRendererGeneric::GetCheckBoxSize(wxWindow *WXUNUSED(win))
+{
+    return wxSize(16, 16);
+}
+

 void
 wxRendererGeneric::DrawPushButton(wxWindow *win,
                                   wxDC& dc,
 void
 wxRendererGeneric::DrawPushButton(wxWindow *win,
                                   wxDC& dc,


@@ -666,7 +673,7 @@ wxRendererGeneric::DrawItemSelectionRect(wxWindow * WXUNUSED(win),
 
     dc.SetBrush(brush);
     if ((flags & wxCONTROL_CURRENT) && (flags & wxCONTROL_FOCUSED)
 
     dc.SetBrush(brush);
     if ((flags & wxCONTROL_CURRENT) && (flags & wxCONTROL_FOCUSED)

-#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__)
+#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__) && wxOSX_USE_CARBON

                 && IsControlActive( (ControlRef)win->GetHandle() )
 #endif
     )
                 && IsControlActive( (ControlRef)win->GetHandle() )
 #endif
     )