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

Fix adding/removing categorized/alphabetic mode buttons in wxPropertyGridManager.

Browse Source 
Modify wxPropertyGridManager::RecreateControls() to allow adding/removing categorized/alphabetic mode buttons to/from wxPG manager tool bar at any time (not only when creating the tool bar).
Modify wxPropertyGridManager::SetExtraStyle() to fully support manipulating these buttons via wxPG_EX_MODE_BUTTONS flag.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78149 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Artur Wieczorek 2014-11-15 17:14:39 +00:00
parent dc555a92e3
commit c0e2e0c5d8
2 changed files with 76 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@ -88,6 +88,7 @@ All (GUI):
- Always disable wxWizard "Back" button on the starting page (pmgrace30).
- Add wxUIActionSimulator::Select().
- Add wxOwnerDrawnComboBox::Is{List,Text}Empty() methods.
- Fix creating/removing mode buttons in wxPG manager (Artur Wieczorek).
wxGTK:

105
src/propgrid/manager.cpp
View File

@ -672,7 +672,7 @@ void wxPropertyGridManager::SetExtraStyle( long exStyle )
wxWindow::SetExtraStyle( exStyle );
m_pPropGrid->SetExtraStyle( exStyle & 0xFFFFF000 );
#if wxUSE_TOOLBAR
if ( (exStyle & wxPG_EX_NO_FLAT_TOOLBAR) && m_pToolbar )
if ( (exStyle & (wxPG_EX_NO_FLAT_TOOLBAR|wxPG_EX_MODE_BUTTONS)) && m_pToolbar )
RecreateControls();
#endif
}
@ -1450,7 +1450,6 @@ void wxPropertyGridManager::RefreshProperty( wxPGProperty* p )
void wxPropertyGridManager::RecreateControls()
{
bool was_shown = IsShown();
if ( was_shown )
Show ( false );
@ -1458,6 +1457,8 @@ void wxPropertyGridManager::RecreateControls()
#if wxUSE_TOOLBAR
if ( m_windowStyle & wxPG_TOOLBAR )
{
bool tbModified = false;
// Has toolbar.
if ( !m_pToolbar )
{
@ -1489,45 +1490,90 @@ void wxPropertyGridManager::RecreateControls()
#endif
m_pToolbar->SetCursor ( *wxSTANDARD_CURSOR );
tbModified = true;
m_categorizedModeToolId = -1;
m_alphabeticModeToolId = -1;
}
if ( (GetExtraStyle()&wxPG_EX_MODE_BUTTONS) )
if ( (GetExtraStyle()&wxPG_EX_MODE_BUTTONS) )
{
// Add buttons if they don't already exist.
if (m_categorizedModeToolId == -1)
{
wxString desc1(_("Categorized Mode"));
wxString desc2(_("Alphabetic Mode"));
wxToolBarToolBase* tool;
tool = m_pToolbar->AddTool(wxID_ANY,
desc1,
wxBitmap(gs_xpm_catmode),
desc1,
wxITEM_RADIO);
wxString desc(_("Categorized Mode"));
wxToolBarToolBase* tool = m_pToolbar->InsertTool(0,
wxID_ANY,
desc,
wxBitmap(gs_xpm_catmode),
wxNullBitmap,
wxITEM_RADIO,
desc);
m_categorizedModeToolId = tool->GetId();
tool = m_pToolbar->AddTool(wxID_ANY,
desc2,
wxBitmap(gs_xpm_noncatmode),
desc2,
wxITEM_RADIO);
m_alphabeticModeToolId = tool->GetId();
m_pToolbar->Realize();
tbModified = true;
Connect(m_categorizedModeToolId,
wxEVT_TOOL,
wxCommandEventHandler(
wxPropertyGridManager::OnToolbarClick));
wxPropertyGridManager::OnToolbarClick));
}
if (m_alphabeticModeToolId == -1)
{
wxString desc(_("Alphabetic Mode"));
wxToolBarToolBase* tool = m_pToolbar->InsertTool(1,
wxID_ANY,
desc,
wxBitmap(gs_xpm_noncatmode),
wxNullBitmap,
wxITEM_RADIO,
desc);
m_alphabeticModeToolId = tool->GetId();
tbModified = true;
Connect(m_alphabeticModeToolId,
wxEVT_TOOL,
wxCommandEventHandler(
wxPropertyGridManager::OnToolbarClick));
}
else
{
m_categorizedModeToolId = -1;
m_alphabeticModeToolId = -1;
wxPropertyGridManager::OnToolbarClick));
}
// Both buttons should exist here.
wxASSERT( m_categorizedModeToolId != -1 && m_alphabeticModeToolId != -1);
}
else
{
// Remove buttons if they exist.
if (m_categorizedModeToolId != -1)
{
Disconnect(m_categorizedModeToolId,
wxEVT_TOOL,
wxCommandEventHandler(
wxPropertyGridManager::OnToolbarClick));
m_pToolbar->DeleteTool(m_categorizedModeToolId);
m_categorizedModeToolId = -1;
tbModified = true;
}
if (m_alphabeticModeToolId != -1)
{
Disconnect(m_alphabeticModeToolId,
wxEVT_TOOL,
wxCommandEventHandler(
wxPropertyGridManager::OnToolbarClick));
m_pToolbar->DeleteTool(m_alphabeticModeToolId);
m_alphabeticModeToolId = -1;
tbModified = true;
}
// No button should exist here.
wxASSERT( m_categorizedModeToolId == -1 && m_alphabeticModeToolId == -1);
}
// Rebuild toolbar if any changes were applied.
if (tbModified)
{
m_pToolbar->Realize();
}
if ( (GetExtraStyle() & wxPG_EX_MODE_BUTTONS) )
@ -1551,7 +1597,6 @@ void wxPropertyGridManager::RecreateControls()
m_pToolbar->ToggleTool(toggle_but_on_ind, true);
m_pToolbar->ToggleTool(toggle_but_off_ind, false);
}
}
else
{