Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed a severe crash bug

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61798 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2009-09-01 13:13:58 +00:00
parent 890defb4f3
commit 9a30da4d1f
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/propgrid/propgridiface.h
View File

@@ -1349,13 +1349,17 @@ private:
// Cannot be GetGrid() due to ambiguity issues. // Cannot be GetGrid() due to ambiguity issues.
wxPropertyGrid* GetPropertyGrid() wxPropertyGrid* GetPropertyGrid()
{ {
if ( !m_pState )
return NULL;
return m_pState->GetGrid(); return m_pState->GetGrid();
} }
// Cannot be GetGrid() due to ambiguity issues. // Cannot be GetGrid() due to ambiguity issues.
const wxPropertyGrid* GetPropertyGrid() const const wxPropertyGrid* GetPropertyGrid() const
{ {
return (const wxPropertyGrid*) m_pState->GetGrid(); if ( !m_pState )
return NULL;
return static_cast<const wxPropertyGrid*>(m_pState->GetGrid());
} }
#endif // #ifndef SWIG #endif // #ifndef SWIG

4
src/propgrid/propgridiface.cpp
View File

@@ -217,7 +217,9 @@ wxPGProperty* wxPropertyGridInterface::GetSelection() const
bool wxPropertyGridInterface::ClearSelection( bool validation ) bool wxPropertyGridInterface::ClearSelection( bool validation )
{ {
bool res = DoClearSelection(validation, wxPG_SEL_DONT_SEND_EVENT); bool res = DoClearSelection(validation, wxPG_SEL_DONT_SEND_EVENT);
GetPropertyGrid()->Refresh(); wxPropertyGrid* pg = GetPropertyGrid();
if ( pg )
pg->Refresh();
return res; return res;
} }