From 92d2be5842c042f3c19bdc85df3c2f8e543fbe83 Mon Sep 17 00:00:00 2001 From: Artur Wieczorek Date: Sun, 28 Apr 2019 18:34:36 +0200 Subject: [PATCH] Resolve ambiguity in calling overloaded wxPropertyGrid::SendEvent() The right overloaded SendEvent() function can be determined by explicitly casting second argument of the call to (wxPGProperty*) type. --- src/propgrid/manager.cpp | 2 +- src/propgrid/propgrid.cpp | 4 ++-- src/propgrid/propgridpagestate.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/propgrid/manager.cpp b/src/propgrid/manager.cpp index f61125feb0..a831a524cc 100644 --- a/src/propgrid/manager.cpp +++ b/src/propgrid/manager.cpp @@ -368,7 +368,7 @@ private: OnSetColumnWidth(col, colWidth); - pg->SendEvent(wxEVT_PG_COLS_RESIZED, NULL); + pg->SendEvent(wxEVT_PG_COLS_RESIZED, (wxPGProperty*)NULL); pg->SendEvent(wxEVT_PG_COL_DRAGGING, NULL, NULL, 0, (unsigned int)col); diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp index 7d775f6df2..a631cc2d59 100644 --- a/src/propgrid/propgrid.cpp +++ b/src/propgrid/propgrid.cpp @@ -4889,7 +4889,7 @@ bool wxPropertyGrid::HandleMouseClick( int x, unsigned int y, wxMouseEvent &even { ResetColumnSizes( true ); - SendEvent(wxEVT_PG_COLS_RESIZED, NULL); + SendEvent(wxEVT_PG_COLS_RESIZED, (wxPGProperty*)NULL); SendEvent(wxEVT_PG_COL_DRAGGING, m_propHover, NULL, @@ -5048,7 +5048,7 @@ bool wxPropertyGrid::HandleMouseMove( int x, unsigned int y, wxPG_SPLITTER_REFRESH | wxPG_SPLITTER_FROM_EVENT); - SendEvent(wxEVT_PG_COLS_RESIZED, NULL); + SendEvent(wxEVT_PG_COLS_RESIZED, (wxPGProperty*)NULL); SendEvent(wxEVT_PG_COL_DRAGGING, m_propHover, NULL, diff --git a/src/propgrid/propgridpagestate.cpp b/src/propgrid/propgridpagestate.cpp index 7de6f43938..19c4ee626d 100644 --- a/src/propgrid/propgridpagestate.cpp +++ b/src/propgrid/propgridpagestate.cpp @@ -401,7 +401,7 @@ void wxPropertyGridPageState::OnClientWidthChange( int newWidth, int widthChange if ( pg->GetState() == this ) { - pg->SendEvent(wxEVT_PG_COLS_RESIZED, NULL); + pg->SendEvent(wxEVT_PG_COLS_RESIZED, (wxPGProperty*)NULL); } }