From 2c544b402610082d2a6193c5e7a364cbfb515942 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 16 May 2013 14:42:50 +0000 Subject: [PATCH] Rename CreateWindow() to CreateDialog() in generic wxPreferencesEditor code. No real changes, just rename a method to avoid confusion with wxPreferencesPage::CreateWindow(). Also return the concrete type of the dialog, not a base wxDialog, as it will be useful for future changes. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74004 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/preferencesg.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/generic/preferencesg.cpp b/src/generic/preferencesg.cpp index e9b7fbb3a9..98170cf071 100644 --- a/src/generic/preferencesg.cpp +++ b/src/generic/preferencesg.cpp @@ -79,7 +79,7 @@ public: } protected: - virtual wxDialog *CreateWindow(wxWindow *parent) + wxGenericPrefsDialog *CreateDialog(wxWindow *parent) { wxGenericPrefsDialog *dlg = new wxGenericPrefsDialog(parent); @@ -124,7 +124,7 @@ public: { if ( !m_win ) { - wxWindow *win = CreateWindow(parent); + wxWindow *win = CreateDialog(parent); win->Show(); m_win = win; } @@ -158,7 +158,7 @@ class wxModalPreferencesEditorImpl : public wxGenericPreferencesEditorImplBase public: virtual void Show(wxWindow* parent) { - wxScopedPtr dlg(CreateWindow(parent)); + wxScopedPtr dlg(CreateDialog(parent)); dlg->Fit(); dlg->ShowModal(); } -- 2.49.0