AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clear grid selection more consistently prior clear operations; improved Clear() tests (fixes #10497)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli 2009-02-17 18:01:06 +00:00
parent 2250d25c06
commit 8dee26e107
4 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
samples/propgrid/tests.cpp
View File

@ -1005,12 +1005,29 @@ bool FormMain::RunTests( bool fullTest, bool interactive )
}
{
RT_START_TEST(ManagerClear)
RT_START_TEST(Clear)
// Manager clear
pgman->SelectProperty("Label");
pgman->Clear();
if ( pgman->GetPageCount() )
RT_FAILURE();
if ( pgman->GetGrid()->GetRoot()->GetChildCount() )
RT_FAILURE();
// Recreate the original grid
CreateGrid( -1, -1 );
pgman = m_pPropGridManager;
// Grid clear
pgman->SelectProperty("Label");
pgman->GetGrid()->Clear();
if ( pgman->GetGrid()->GetRoot()->GetChildCount() )
RT_FAILURE();
// Recreate the original grid
CreateGrid( -1, -1 );
pgman = m_pPropGridManager;

2
src/propgrid/manager.cpp
View File

@ -657,6 +657,8 @@ wxPropertyGridPageState* wxPropertyGridManager::GetPageState( int page ) const
void wxPropertyGridManager::Clear()
{
m_pPropGrid->ClearSelection(false);
m_pPropGrid->Freeze();
int i;

2
src/propgrid/propgrid.cpp
View File

@ -2114,8 +2114,6 @@ void wxPropertyGrid::Refresh( bool WXUNUSED(eraseBackground),
void wxPropertyGrid::Clear()
{
ClearSelection(false);
m_pState->DoClear();
m_propHover = NULL;

11
src/propgrid/propgridpagestate.cpp
View File

@ -268,6 +268,15 @@ void wxPropertyGridPageState::InitNonCatMode()
void wxPropertyGridPageState::DoClear()
{
if ( m_pPropGrid->GetState() == this )
{
m_pPropGrid->ClearSelection(false);
}
else
{
m_selected = NULL;
}
m_regularArray.Empty();
if ( m_abcArray )
m_abcArray->Empty();
@ -280,8 +289,6 @@ void wxPropertyGridPageState::DoClear()
m_virtualHeight = 0;
m_vhCalcPending = 0;
m_selected = NULL;
}
// -----------------------------------------------------------------------