Prevent crash when m_defGridAttr is NULL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13446 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1984,7 +1984,7 @@ const wxColour& wxGridCellAttr::GetTextColour() const
|
|||||||
{
|
{
|
||||||
return m_colText;
|
return m_colText;
|
||||||
}
|
}
|
||||||
else if (m_defGridAttr != this)
|
else if (m_defGridAttr && m_defGridAttr != this)
|
||||||
{
|
{
|
||||||
return m_defGridAttr->GetTextColour();
|
return m_defGridAttr->GetTextColour();
|
||||||
}
|
}
|
||||||
@@ -2000,7 +2000,7 @@ const wxColour& wxGridCellAttr::GetBackgroundColour() const
|
|||||||
{
|
{
|
||||||
if (HasBackgroundColour())
|
if (HasBackgroundColour())
|
||||||
return m_colBack;
|
return m_colBack;
|
||||||
else if (m_defGridAttr != this)
|
else if (m_defGridAttr && m_defGridAttr != this)
|
||||||
return m_defGridAttr->GetBackgroundColour();
|
return m_defGridAttr->GetBackgroundColour();
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -2014,7 +2014,7 @@ const wxFont& wxGridCellAttr::GetFont() const
|
|||||||
{
|
{
|
||||||
if (HasFont())
|
if (HasFont())
|
||||||
return m_font;
|
return m_font;
|
||||||
else if (m_defGridAttr != this)
|
else if (m_defGridAttr && m_defGridAttr != this)
|
||||||
return m_defGridAttr->GetFont();
|
return m_defGridAttr->GetFont();
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -2031,7 +2031,7 @@ void wxGridCellAttr::GetAlignment(int *hAlign, int *vAlign) const
|
|||||||
if ( hAlign ) *hAlign = m_hAlign;
|
if ( hAlign ) *hAlign = m_hAlign;
|
||||||
if ( vAlign ) *vAlign = m_vAlign;
|
if ( vAlign ) *vAlign = m_vAlign;
|
||||||
}
|
}
|
||||||
else if (m_defGridAttr != this)
|
else if (m_defGridAttr && m_defGridAttr != this)
|
||||||
m_defGridAttr->GetAlignment(hAlign, vAlign);
|
m_defGridAttr->GetAlignment(hAlign, vAlign);
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -2072,7 +2072,7 @@ wxGridCellRenderer* wxGridCellAttr::GetRenderer(wxGrid* grid, int row, int col)
|
|||||||
|
|
||||||
if ( !renderer )
|
if ( !renderer )
|
||||||
{
|
{
|
||||||
if ( this != m_defGridAttr )
|
if (m_defGridAttr && this != m_defGridAttr )
|
||||||
{
|
{
|
||||||
// if we still don't have one then use the grid default
|
// if we still don't have one then use the grid default
|
||||||
// (no need for IncRef() here neither)
|
// (no need for IncRef() here neither)
|
||||||
@@ -2120,7 +2120,7 @@ wxGridCellEditor* wxGridCellAttr::GetEditor(wxGrid* grid, int row, int col) cons
|
|||||||
|
|
||||||
if ( !editor )
|
if ( !editor )
|
||||||
{
|
{
|
||||||
if ( this != m_defGridAttr )
|
if ( m_defGridAttr && this != m_defGridAttr )
|
||||||
{
|
{
|
||||||
// if we still don't have one then use the grid default
|
// if we still don't have one then use the grid default
|
||||||
// (no need for IncRef() here neither)
|
// (no need for IncRef() here neither)
|
||||||
|
Reference in New Issue
Block a user