Reset g_lastMouseEvent after processing the mouse button release event

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

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 771dab7a474a134ba1116c31b775d4cac50796be..f1bcc09c3cf2a1ba0e7866de5a3cc2a2747a6bf1 100644 (file)
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -495,7 +495,9 @@ wxSize wxDataViewProgressRenderer::GetSize()
 // wxDataViewDateRenderer
 // ---------------------------------------------------------
 
-#if wxUSE_CALENDARCTRL
+#define wxUSE_DATE_RENDERER_POPUP (wxUSE_CALENDARCTRL && wxUSE_POPUPWIN)
+
+#if wxUSE_DATE_RENDERER_POPUP
 
 class wxDataViewDateRendererPopupTransient: public wxPopupTransientWindow
 {
@@ -543,7 +545,7 @@ void wxDataViewDateRendererPopupTransient::OnCalendar( wxCalendarEvent &event )
     DismissAndNotify();
 }
 
-#endif // wxUSE_CALENDARCTRL
+#endif // wxUSE_DATE_RENDERER_POPUP
 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewDateRenderer, wxDataViewCustomRenderer)
 
@@ -584,16 +586,16 @@ bool wxDataViewDateRenderer::Activate( wxRect WXUNUSED(cell), wxDataViewListMode
     model->GetValue( variant, col, row );
     wxDateTime value = variant.GetDateTime();
 
-#if wxUSE_CALENDARCTRL
+#if wxUSE_DATE_RENDERER_POPUP
     wxDataViewDateRendererPopupTransient *popup = new wxDataViewDateRendererPopupTransient(
         GetOwner()->GetOwner()->GetParent(), &value, model, col, row );
     wxPoint pos = wxGetMousePosition();
     popup->Move( pos );
     popup->Layout();
     popup->Popup( popup->m_cal );
-#else
+#else // !wxUSE_DATE_RENDERER_POPUP
     wxMessageBox(value.Format());
-#endif
+#endif // wxUSE_DATE_RENDERER_POPUP/!wxUSE_DATE_RENDERER_POPUP
     return true;
 }
 
@@ -1196,7 +1198,11 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
             item_rect.width = size.x;
             item_rect.height= size.y;
-            cell->Render( item_rect, &dc, 0 );
+
+            int state = 0;
+            if (item == m_currentRow)
+                state |= wxDATAVIEW_CELL_SELECTED;
+            cell->Render( item_rect, &dc, state );
         }
 
         cell_rect.x += cell_rect.width;