From f9450029bc0f75bc9ccb97488e839bc969070277 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 2 Dec 2013 16:34:35 +0000
Subject: [PATCH] Fix clicking on checkboxes in generic wxDataViewCtrl.

Back port the fix of r75329 from the trunk but without changing
GetEffectiveAlignment() visibility to avoid changing the ABI.

See #15731.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75330 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 docs/changes.txt         | 1 +
 src/generic/datavgen.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index 1decb28b30..134c7ab1ea 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -594,6 +594,7 @@ wxGTK:
 wxMSW:
 
 - Fix blank wxBitmapComboBox dropdown appearance.
+- Fix clicking on checkboxes in wxDataViewCtrl.
 - Make "%lu" work with size_t arguments under Win64 (laro).
 - Fix wxRegion::Offset() with shared objects (Joost Nieuwenhuijse).
 - Fix wxSocket::Initialize() after Shutdown() (Laurent Poujoulat).
diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 05f1b3992e..1c3385896c 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -4414,7 +4414,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
             // adjust the rectangle ourselves to account for the alignment
             int align = cell->GetAlignment();
             if ( align == wxDVR_DEFAULT_ALIGNMENT )
-                align = wxALIGN_CENTRE;
+                align = cell->GetOwner()->GetAlignment() | wxALIGN_CENTRE_VERTICAL;
 
             wxRect rectItem = cell_rect;
             const wxSize size = cell->GetSize();