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

In wxPropertyGridPageState use Boolean member variables to store Boolean values.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77888 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Artur Wieczorek
2014-09-25 17:29:50 +00:00
parent 329b59e263
commit 89364e95b9
4 changed files with 41 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/propgrid/propgrid.cpp
View File

@@ -608,7 +608,7 @@ void wxPropertyGrid::SetWindowStyleFlag( long style )
if ( !IsFrozen() )
PrepareAfterItemsAdded();
else
m_pState->m_itemsAdded = 1;
m_pState->m_itemsAdded = true;
}
#if wxPG_SUPPORT_TOOLTIPS
if ( !(old_style & wxPG_TOOLTIPS) && (style & wxPG_TOOLTIPS) )
@@ -1547,7 +1547,7 @@ void wxPropertyGrid::PrepareAfterItemsAdded()
{
if ( !m_pState || !m_pState->m_itemsAdded ) return;
m_pState->m_itemsAdded = 0;
m_pState->m_itemsAdded = false;
if ( m_windowStyle & wxPG_AUTO_SORT )
Sort(wxPG_SORT_TOP_LEVEL_ONLY);
@@ -2683,12 +2683,12 @@ bool wxPropertyGrid::EnableCategories( bool enable )
{
if ( m_windowStyle & wxPG_AUTO_SORT )
{
m_pState->m_itemsAdded = 1; // force
m_pState->m_itemsAdded = true; // force
PrepareAfterItemsAdded();
}
}
else
m_pState->m_itemsAdded = 1;
m_pState->m_itemsAdded = true;
// No need for RecalculateVirtualSize() here - it is already called in
// wxPropertyGridPageState method above.
@@ -2764,7 +2764,7 @@ void wxPropertyGrid::SwitchState( wxPropertyGridPageState* pNewState )
Refresh();
}
else
m_pState->m_itemsAdded = 1;
m_pState->m_itemsAdded = true;
}
// -----------------------------------------------------------------------
@@ -3325,7 +3325,7 @@ bool wxPropertyGrid::DoPropertyChanged( wxPGProperty* p, unsigned int selFlags )
wxPGProperty* selected = GetSelection();
m_pState->m_anyModified = 1;
m_pState->m_anyModified = true;
// Maybe need to update control
wxASSERT( m_chgInfo_changedProperty != NULL );