In wxPropertyGridManager, alphabetic mode is now sorted even if wxPG_AUTO_SORT flag is absent (fixes wxPG sf bug #2162053)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56437 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1363,13 +1363,25 @@ void wxPropertyGridManager::OnToolbarClick( wxCommandEvent &event )
|
||||
{
|
||||
// Categorized mode.
|
||||
if ( m_pPropGrid->m_windowStyle & wxPG_HIDE_CATEGORIES )
|
||||
{
|
||||
if ( !m_pPropGrid->HasInternalFlag(wxPG_FL_CATMODE_AUTO_SORT) )
|
||||
m_pPropGrid->m_windowStyle &= ~wxPG_AUTO_SORT;
|
||||
m_pPropGrid->EnableCategories( true );
|
||||
}
|
||||
}
|
||||
else if ( id == ( baseId + ID_ADVTBITEMSBASE_OFFSET + 1 ) )
|
||||
{
|
||||
// Alphabetic mode.
|
||||
if ( !(m_pPropGrid->m_windowStyle & wxPG_HIDE_CATEGORIES) )
|
||||
{
|
||||
if ( m_pPropGrid->HasFlag(wxPG_AUTO_SORT) )
|
||||
m_pPropGrid->SetInternalFlag(wxPG_FL_CATMODE_AUTO_SORT);
|
||||
else
|
||||
m_pPropGrid->ClearInternalFlag(wxPG_FL_CATMODE_AUTO_SORT);
|
||||
|
||||
m_pPropGrid->m_windowStyle |= wxPG_AUTO_SORT;
|
||||
m_pPropGrid->EnableCategories( false );
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
Reference in New Issue
Block a user