From c41ff4e694edaf78f3788e19159c137948ac6195 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Sun, 17 Feb 2019 18:00:26 -0800 Subject: [PATCH] Remove unuseable wxPGArrayEditorDialog ctor It calls Create(), which calls the pure virtual ArrayGetCount(), which will crash, as the required override can't be called from the base class ctor. --- include/wx/propgrid/props.h | 7 ------- interface/wx/propgrid/props.h | 7 ------- src/propgrid/props.cpp | 14 -------------- 3 files changed, 28 deletions(-) diff --git a/include/wx/propgrid/props.h b/include/wx/propgrid/props.h index 9649178710..65299be2d1 100644 --- a/include/wx/propgrid/props.h +++ b/include/wx/propgrid/props.h @@ -810,13 +810,6 @@ public: void Init(); - wxPGArrayEditorDialog( wxWindow *parent, - const wxString& message, - const wxString& caption, - long style = wxAEDIALOG_STYLE, - const wxPoint& pos = wxDefaultPosition, - const wxSize& sz = wxDefaultSize ); - bool Create( wxWindow *parent, const wxString& message, const wxString& caption, diff --git a/interface/wx/propgrid/props.h b/interface/wx/propgrid/props.h index e7ef66a847..f83b30a3d0 100644 --- a/interface/wx/propgrid/props.h +++ b/interface/wx/propgrid/props.h @@ -711,13 +711,6 @@ public: void Init(); - wxPGArrayEditorDialog( wxWindow *parent, - const wxString& message, - const wxString& caption, - long style = wxAEDIALOG_STYLE, - const wxPoint& pos = wxDefaultPosition, - const wxSize& sz = wxDefaultSize ); - bool Create( wxWindow *parent, const wxString& message, const wxString& caption, diff --git a/src/propgrid/props.cpp b/src/propgrid/props.cpp index ab901c567e..86d1f98890 100644 --- a/src/propgrid/props.cpp +++ b/src/propgrid/props.cpp @@ -2404,20 +2404,6 @@ void wxPGArrayEditorDialog::Init() // ----------------------------------------------------------------------- -wxPGArrayEditorDialog::wxPGArrayEditorDialog( wxWindow *parent, - const wxString& message, - const wxString& caption, - long style, - const wxPoint& pos, - const wxSize& sz ) - : wxDialog() -{ - Init(); - Create(parent,message,caption,style,pos,sz); -} - -// ----------------------------------------------------------------------- - bool wxPGArrayEditorDialog::Create( wxWindow *parent, const wxString& message, const wxString& caption,