X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/670d01778a69731665cbb7c77726f067a1c8ce17..3e97b55017ab8fee83025a7573deb3bb48577d87:/src/generic/grid.cpp?ds=inline

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index d19952c919..707ebedabc 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -476,6 +476,15 @@ void wxGridCellAttr::GetAlignment(int *hAlign, int *vAlign) const
     }
 }
 
+void wxGridCellAttr::GetNonDefaultAlignment(int *hAlign, int *vAlign) const
+{
+    if ( hAlign && m_hAlign != wxALIGN_INVALID )
+        *hAlign = m_hAlign;
+
+    if ( vAlign && m_vAlign != wxALIGN_INVALID )
+        *vAlign = m_vAlign;
+}
+
 void wxGridCellAttr::GetSize( int *num_rows, int *num_cols ) const
 {
     if ( num_rows )
@@ -3573,7 +3582,7 @@ void wxGrid::ChangeCursorMode(CursorMode mode,
                               bool captureMouse)
 {
 #if wxUSE_LOG_TRACE
-    static const wxChar *cursorModes[] =
+    static const wxChar *const cursorModes[] =
     {
         wxT("SELECT_CELL"),
         wxT("RESIZE_ROW"),
@@ -5443,9 +5452,15 @@ void wxGrid::DrawRowLabel( wxDC& dc, int row )
 
     wxGridCellAttrProvider * const
         attrProvider = m_table ? m_table->GetAttrProvider() : NULL;
+
+    // notice that an explicit static_cast is needed to avoid a compilation
+    // error with VC7.1 which, for some reason, tries to instantiate (abstract)
+    // wxGridRowHeaderRenderer class without it
     const wxGridRowHeaderRenderer&
         rend = attrProvider ? attrProvider->GetRowHeaderRenderer(row)
-                            : gs_defaultHeaderRenderers.rowRenderer;
+                            : static_cast<const wxGridRowHeaderRenderer&>
+                                (gs_defaultHeaderRenderers.rowRenderer);
+
     wxRect rect(0, GetRowTop(row), m_rowLabelWidth, GetRowHeight(row));
     rend.DrawBorder(*this, dc, rect);
 
@@ -5518,7 +5533,8 @@ void wxGrid::DrawCornerLabel(wxDC& dc)
             attrProvider = m_table ? m_table->GetAttrProvider() : NULL;
         const wxGridCornerHeaderRenderer&
             rend = attrProvider ? attrProvider->GetCornerRenderer()
-                                : gs_defaultHeaderRenderers.cornerRenderer;
+                                : static_cast<wxGridCornerHeaderRenderer&>
+                                    (gs_defaultHeaderRenderers.cornerRenderer);
 
         rend.DrawBorder(*this, dc, rect);
     }
@@ -5536,7 +5552,8 @@ void wxGrid::DrawColLabel(wxDC& dc, int col)
         attrProvider = m_table ? m_table->GetAttrProvider() : NULL;
     const wxGridColumnHeaderRenderer&
         rend = attrProvider ? attrProvider->GetColumnHeaderRenderer(col)
-                            : gs_defaultHeaderRenderers.colRenderer;
+                            : static_cast<wxGridColumnHeaderRenderer&>
+                                (gs_defaultHeaderRenderers.colRenderer);
 
     if ( m_nativeColumnLabels )
     {