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

Use dedicated event type to notify header about column width changes

Browse Source 
Notification about changes of column widths needs to be sent locally from wxPropertyGrid to  wxPropertyGridManager (to update the header) so it would be good to use a dedicated non-public event type for these purposes.
This commit is contained in:
Artur Wieczorek
2019-04-27 21:53:49 +02:00
parent fa35fdc600
commit f39e70be15
5 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/propgrid/manager.h
View File

@@ -543,8 +543,8 @@ protected:
#endif #endif
void OnResize( wxSizeEvent& event ); void OnResize( wxSizeEvent& event );
void OnPropertyGridSelect( wxPropertyGridEvent& event ); void OnPropertyGridSelect( wxPropertyGridEvent& event );
void OnPGColDrag( wxPropertyGridEvent& event );
void OnPGScrollH(wxPropertyGridEvent& evt); void OnPGScrollH(wxPropertyGridEvent& evt);
void OnColWidthsChanged(wxPropertyGridEvent& evt);
wxPropertyGrid* m_pPropGrid; wxPropertyGrid* m_pPropGrid;

2
include/wx/propgrid/propgrid.h
View File

@@ -2030,7 +2030,9 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_PROPGRID,
wxEVT_PG_COL_DRAGGING, wxPropertyGridEvent ); wxEVT_PG_COL_DRAGGING, wxPropertyGridEvent );
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_PROPGRID, wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_PROPGRID,
wxEVT_PG_COL_END_DRAG, wxPropertyGridEvent ); wxEVT_PG_COL_END_DRAG, wxPropertyGridEvent );
// Events used only internally
wxDECLARE_EVENT(wxEVT_PG_HSCROLL, wxPropertyGridEvent); wxDECLARE_EVENT(wxEVT_PG_HSCROLL, wxPropertyGridEvent);
wxDECLARE_EVENT(wxEVT_PG_COLS_RESIZED, wxPropertyGridEvent);
#else #else
enum { enum {

24
src/propgrid/manager.cpp
View File

@@ -368,6 +368,7 @@ private:
OnSetColumnWidth(col, colWidth); OnSetColumnWidth(col, colWidth);
pg->SendEvent(wxEVT_PG_COLS_RESIZED, NULL);
pg->SendEvent(wxEVT_PG_COL_DRAGGING, pg->SendEvent(wxEVT_PG_COL_DRAGGING,
NULL, NULL, 0, NULL, NULL, 0,
(unsigned int)col); (unsigned int)col);
@@ -1933,18 +1934,16 @@ void wxPropertyGridManager::ReconnectEventHandlers(wxWindowID oldId, wxWindowID
{ {
Unbind(wxEVT_PG_SELECTED, &wxPropertyGridManager::OnPropertyGridSelect, this, Unbind(wxEVT_PG_SELECTED, &wxPropertyGridManager::OnPropertyGridSelect, this,
oldId); oldId);
Unbind(wxEVT_PG_COL_DRAGGING, &wxPropertyGridManager::OnPGColDrag, this,
oldId);
Unbind(wxEVT_PG_HSCROLL, &wxPropertyGridManager::OnPGScrollH, this, oldId); Unbind(wxEVT_PG_HSCROLL, &wxPropertyGridManager::OnPGScrollH, this, oldId);
Unbind(wxEVT_PG_COLS_RESIZED, &wxPropertyGridManager::OnColWidthsChanged, this, oldId);
} }
if (newId != wxID_NONE) if (newId != wxID_NONE)
{ {
Bind(wxEVT_PG_SELECTED, &wxPropertyGridManager::OnPropertyGridSelect, this, Bind(wxEVT_PG_SELECTED, &wxPropertyGridManager::OnPropertyGridSelect, this,
newId); newId);
Bind(wxEVT_PG_COL_DRAGGING, &wxPropertyGridManager::OnPGColDrag, this,
newId);
Bind(wxEVT_PG_HSCROLL, &wxPropertyGridManager::OnPGScrollH, this, newId); Bind(wxEVT_PG_HSCROLL, &wxPropertyGridManager::OnPGScrollH, this, newId);
Bind(wxEVT_PG_COLS_RESIZED, &wxPropertyGridManager::OnColWidthsChanged, this, newId);
} }
} }
@@ -1962,15 +1961,6 @@ void wxPropertyGridManager::OnPropertyGridSelect( wxPropertyGridEvent& event )
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
void
wxPropertyGridManager::OnPGColDrag( wxPropertyGridEvent& WXUNUSED(event) )
{
#if wxUSE_HEADERCTRL
if ( m_pHeaderCtrl && m_pHeaderCtrl->IsShown() )
m_pHeaderCtrl->OnColumWidthsChanged();
#endif
}
void wxPropertyGridManager::OnPGScrollH(wxPropertyGridEvent& evt) void wxPropertyGridManager::OnPGScrollH(wxPropertyGridEvent& evt)
{ {
#if wxUSE_HEADERCTRL #if wxUSE_HEADERCTRL
@@ -1981,6 +1971,14 @@ void wxPropertyGridManager::OnPGScrollH(wxPropertyGridEvent& evt)
#endif // wxUSE_HEADERCTRL #endif // wxUSE_HEADERCTRL
} }
void wxPropertyGridManager::OnColWidthsChanged(wxPropertyGridEvent& WXUNUSED(evt))
{
#if wxUSE_HEADERCTRL
if ( m_pHeaderCtrl )
m_pHeaderCtrl->OnColumWidthsChanged();
#endif
}
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
void wxPropertyGridManager::OnResize( wxSizeEvent& WXUNUSED(event) ) void wxPropertyGridManager::OnResize( wxSizeEvent& WXUNUSED(event) )

4
src/propgrid/propgrid.cpp
View File

@@ -4892,6 +4892,7 @@ bool wxPropertyGrid::HandleMouseClick( int x, unsigned int y, wxMouseEvent &even
{ {
ResetColumnSizes( true ); ResetColumnSizes( true );
SendEvent(wxEVT_PG_COLS_RESIZED, NULL);
SendEvent(wxEVT_PG_COL_DRAGGING, SendEvent(wxEVT_PG_COL_DRAGGING,
m_propHover, m_propHover,
NULL, NULL,
@@ -5050,6 +5051,7 @@ bool wxPropertyGrid::HandleMouseMove( int x, unsigned int y,
wxPG_SPLITTER_REFRESH | wxPG_SPLITTER_REFRESH |
wxPG_SPLITTER_FROM_EVENT); wxPG_SPLITTER_FROM_EVENT);
SendEvent(wxEVT_PG_COLS_RESIZED, NULL);
SendEvent(wxEVT_PG_COL_DRAGGING, SendEvent(wxEVT_PG_COL_DRAGGING,
m_propHover, m_propHover,
NULL, NULL,
@@ -6315,7 +6317,9 @@ wxDEFINE_EVENT( wxEVT_PG_LABEL_EDIT_ENDING, wxPropertyGridEvent );
wxDEFINE_EVENT( wxEVT_PG_COL_BEGIN_DRAG, wxPropertyGridEvent ); wxDEFINE_EVENT( wxEVT_PG_COL_BEGIN_DRAG, wxPropertyGridEvent );
wxDEFINE_EVENT( wxEVT_PG_COL_DRAGGING, wxPropertyGridEvent ); wxDEFINE_EVENT( wxEVT_PG_COL_DRAGGING, wxPropertyGridEvent );
wxDEFINE_EVENT( wxEVT_PG_COL_END_DRAG, wxPropertyGridEvent ); wxDEFINE_EVENT( wxEVT_PG_COL_END_DRAG, wxPropertyGridEvent );
// Events used only internally
wxDEFINE_EVENT( wxEVT_PG_HSCROLL, wxPropertyGridEvent); wxDEFINE_EVENT( wxEVT_PG_HSCROLL, wxPropertyGridEvent);
wxDEFINE_EVENT( wxEVT_PG_COLS_RESIZED, wxPropertyGridEvent);
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------

5
src/propgrid/propgridpagestate.cpp
View File

@@ -398,6 +398,11 @@ void wxPropertyGridPageState::OnClientWidthChange( int newWidth, int widthChange
} }
} }
} }
if ( pg->GetState() == this )
{
pg->SendEvent(wxEVT_PG_COLS_RESIZED, NULL);
}
} }
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------