From c0548a02fd68a4e8e2eadc7f82789a5eb1bb836a Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 12 Oct 2014 20:48:52 +0000
Subject: [PATCH] Fix vertical cell alignment in wxDataViewCtrl in wxGTK.

Pass the alignment used when creating the column to the renderer.

Closes #16035.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78012 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 docs/changes.txt        |  1 +
 src/common/datavcmn.cpp | 48 ++++++++++++++++++++---------------------
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index 2aa5da4f36..74c5e92749 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -86,6 +86,7 @@ All (GUI):
 wxGTK:
 
 - Support building wxGTK3 under Windows (Kolya Kosenko).
+- Fix vertical cell alignment in wxDataViewCtrl.
 
 wxMSW:
 
diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index 569444c7ad..f3e334dbe4 100644
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -1127,7 +1127,7 @@ wxDataViewCtrlBase::AppendTextColumn( const wxString &label, unsigned int model_
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewTextRenderer( wxT("string"), mode ),
+        new wxDataViewTextRenderer( wxT("string"), mode, align ),
         model_column, width, align, flags );
     AppendColumn( ret );
     return ret;
@@ -1138,7 +1138,7 @@ wxDataViewCtrlBase::AppendIconTextColumn( const wxString &label, unsigned int mo
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode ),
+        new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode, align ),
         model_column, width, align, flags );
     AppendColumn( ret );
     return ret;
@@ -1149,7 +1149,7 @@ wxDataViewCtrlBase::AppendToggleColumn( const wxString &label, unsigned int mode
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewToggleRenderer( wxT("bool"), mode ),
+        new wxDataViewToggleRenderer( wxT("bool"), mode, align ),
         model_column, width, align, flags );
     AppendColumn( ret );
     return ret;
@@ -1160,7 +1160,7 @@ wxDataViewCtrlBase::AppendProgressColumn( const wxString &label, unsigned int mo
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode ),
+        new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, align ),
         model_column, width, align, flags );
     AppendColumn( ret );
     return ret;
@@ -1171,7 +1171,7 @@ wxDataViewCtrlBase::AppendDateColumn( const wxString &label, unsigned int model_
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewDateRenderer( wxT("datetime"), mode ),
+        new wxDataViewDateRenderer( wxT("datetime"), mode, align ),
         model_column, width, align, flags );
     AppendColumn( ret );
     return ret;
@@ -1182,7 +1182,7 @@ wxDataViewCtrlBase::AppendBitmapColumn( const wxString &label, unsigned int mode
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode ),
+        new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode, align ),
         model_column, width, align, flags );
     AppendColumn( ret );
     return ret;
@@ -1193,7 +1193,7 @@ wxDataViewCtrlBase::AppendTextColumn( const wxBitmap &label, unsigned int model_
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewTextRenderer( wxT("string"), mode ),
+        new wxDataViewTextRenderer( wxT("string"), mode, align ),
         model_column, width, align, flags );
     AppendColumn( ret );
     return ret;
@@ -1204,7 +1204,7 @@ wxDataViewCtrlBase::AppendIconTextColumn( const wxBitmap &label, unsigned int mo
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode ),
+        new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode, align ),
         model_column, width, align, flags );
     AppendColumn( ret );
     return ret;
@@ -1215,7 +1215,7 @@ wxDataViewCtrlBase::AppendToggleColumn( const wxBitmap &label, unsigned int mode
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewToggleRenderer( wxT("bool"), mode ),
+        new wxDataViewToggleRenderer( wxT("bool"), mode, align ),
         model_column, width, align, flags );
     AppendColumn( ret );
     return ret;
@@ -1226,7 +1226,7 @@ wxDataViewCtrlBase::AppendProgressColumn( const wxBitmap &label, unsigned int mo
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode ),
+        new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, align ),
         model_column, width, align, flags );
     AppendColumn( ret );
     return ret;
@@ -1237,7 +1237,7 @@ wxDataViewCtrlBase::AppendDateColumn( const wxBitmap &label, unsigned int model_
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewDateRenderer( wxT("datetime"), mode ),
+        new wxDataViewDateRenderer( wxT("datetime"), mode, align ),
         model_column, width, align, flags );
     AppendColumn( ret );
     return ret;
@@ -1248,7 +1248,7 @@ wxDataViewCtrlBase::AppendBitmapColumn( const wxBitmap &label, unsigned int mode
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode ),
+        new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode, align ),
         model_column, width, align, flags );
     AppendColumn( ret );
     return ret;
@@ -1259,7 +1259,7 @@ wxDataViewCtrlBase::PrependTextColumn( const wxString &label, unsigned int model
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewTextRenderer( wxT("string"), mode ),
+        new wxDataViewTextRenderer( wxT("string"), mode, align ),
         model_column, width, align, flags );
     PrependColumn( ret );
     return ret;
@@ -1270,7 +1270,7 @@ wxDataViewCtrlBase::PrependIconTextColumn( const wxString &label, unsigned int m
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode ),
+        new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode, align ),
         model_column, width, align, flags );
     PrependColumn( ret );
     return ret;
@@ -1282,7 +1282,7 @@ wxDataViewCtrlBase::PrependToggleColumn( const wxString &label, unsigned int mod
 {
 
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewToggleRenderer( wxT("bool"), mode ),
+        new wxDataViewToggleRenderer( wxT("bool"), mode, align ),
         model_column, width, align, flags );
     PrependColumn( ret );
     return ret;
@@ -1293,7 +1293,7 @@ wxDataViewCtrlBase::PrependProgressColumn( const wxString &label, unsigned int m
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode ),
+        new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, align ),
         model_column, width, align, flags );
     PrependColumn( ret );
     return ret;
@@ -1304,7 +1304,7 @@ wxDataViewCtrlBase::PrependDateColumn( const wxString &label, unsigned int model
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewDateRenderer( wxT("datetime"), mode ),
+        new wxDataViewDateRenderer( wxT("datetime"), mode, align ),
         model_column, width, align, flags );
     PrependColumn( ret );
     return ret;
@@ -1315,7 +1315,7 @@ wxDataViewCtrlBase::PrependBitmapColumn( const wxString &label, unsigned int mod
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode ),
+        new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode, align ),
         model_column, width, align, flags );
     PrependColumn( ret );
     return ret;
@@ -1326,7 +1326,7 @@ wxDataViewCtrlBase::PrependTextColumn( const wxBitmap &label, unsigned int model
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewTextRenderer( wxT("string"), mode ),
+        new wxDataViewTextRenderer( wxT("string"), mode, align ),
         model_column, width, align, flags );
     PrependColumn( ret );
     return ret;
@@ -1337,7 +1337,7 @@ wxDataViewCtrlBase::PrependIconTextColumn( const wxBitmap &label, unsigned int m
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode ),
+        new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode, align ),
         model_column, width, align, flags );
     PrependColumn( ret );
     return ret;
@@ -1348,7 +1348,7 @@ wxDataViewCtrlBase::PrependToggleColumn( const wxBitmap &label, unsigned int mod
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewToggleRenderer( wxT("bool"), mode ),
+        new wxDataViewToggleRenderer( wxT("bool"), mode, align ),
         model_column, width, align, flags );
     PrependColumn( ret );
     return ret;
@@ -1359,7 +1359,7 @@ wxDataViewCtrlBase::PrependProgressColumn( const wxBitmap &label, unsigned int m
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode ),
+        new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, align ),
         model_column, width, align, flags );
     PrependColumn( ret );
     return ret;
@@ -1370,7 +1370,7 @@ wxDataViewCtrlBase::PrependDateColumn( const wxBitmap &label, unsigned int model
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewDateRenderer( wxT("datetime"), mode ),
+        new wxDataViewDateRenderer( wxT("datetime"), mode, align ),
         model_column, width, align, flags );
     PrependColumn( ret );
     return ret;
@@ -1381,7 +1381,7 @@ wxDataViewCtrlBase::PrependBitmapColumn( const wxBitmap &label, unsigned int mod
                             wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     wxDataViewColumn *ret = new wxDataViewColumn( label,
-        new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode ),
+        new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode, align ),
         model_column, width, align, flags );
     PrependColumn( ret );
     return ret;