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

Restore wxPG toolbar buttons state if selecting wxPG page was unsuccessful.

Browse Source 
Toolbar button corresponding to the unsuccessfully selected page should be released and button corresponding to the old page should be pressed again.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78213 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Artur Wieczorek
2014-12-03 16:59:11 +00:00
parent 7dc1ab1c76
commit 922bef4df6
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/propgrid/manager.cpp
View File

@@ -1752,13 +1752,11 @@ void wxPropertyGridManager::OnToolbarClick( wxCommandEvent &event )
// Page Switching.
int index = -1;
size_t i;
wxPropertyGridPage* pdc;
// Find page with given id.
for ( i=0; i<GetPageCount(); i++ )
for ( size_t i = 0; i < GetPageCount(); i++ )
{
pdc = m_arrPages[i];
wxPropertyGridPage* pdc = m_arrPages[i];
if ( pdc->m_toolId == id )
{
index = i;
@@ -1768,14 +1766,25 @@ void wxPropertyGridManager::OnToolbarClick( wxCommandEvent &event )
wxASSERT( index >= 0 );
if ( DoSelectPage( index ) )
if ( DoSelectPage(index) )
{
// Event dispatching must be last.
m_pPropGrid->SendEvent( wxEVT_PG_PAGE_CHANGED, NULL );
m_pPropGrid->SendEvent( wxEVT_PG_PAGE_CHANGED, NULL );
}
else
{
// TODO: Depress the old button on toolbar.
// Restore button state on toolbar.
wxToolBar* tb = wxDynamicCast(event.GetEventObject(), wxToolBar);
wxASSERT( tb );
// Release the current button.
tb->ToggleTool(id, false);
// Depress the old button.
if ( m_selPage >= 0 )
{
wxPropertyGridPage* prevPage = m_arrPages[m_selPage];
tb->ToggleTool(prevPage->m_toolId, true);
}
}
}
}