From c40ce5ce77b63f669f44e35f4f71418ae90d6291 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 14 Aug 2001 11:24:03 +0000 Subject: [PATCH] removed redundant InitDialog methods git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11374 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/generic/panelg.h | 4 ---- include/wx/gtk/dialog.h | 2 -- include/wx/gtk1/dialog.h | 2 -- src/generic/panelg.cpp | 9 +-------- src/gtk/dialog.cpp | 5 ----- src/gtk1/dialog.cpp | 5 ----- 6 files changed, 1 insertion(+), 26 deletions(-) diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h index cf5685d948..dfda5d8ef0 100644 --- a/include/wx/generic/panelg.h +++ b/include/wx/generic/panelg.h @@ -73,10 +73,6 @@ public: // implementation from now on // -------------------------- - // Sends an OnInitDialog event, which in turns transfers data to - // to the dialog via validators. - virtual void InitDialog(); - // responds to colour changes void OnSysColourChanged(wxSysColourChangedEvent& event); diff --git a/include/wx/gtk/dialog.h b/include/wx/gtk/dialog.h index 2d33f945d0..745acbf518 100644 --- a/include/wx/gtk/dialog.h +++ b/include/wx/gtk/dialog.h @@ -74,8 +74,6 @@ public: virtual bool IsModal() const; void SetModal( bool modal ); - virtual void InitDialog(void); - virtual void SetIcon( const wxIcon &icon ); virtual void Iconize( bool WXUNUSED(iconize)) { } virtual bool IsIconized() const { return FALSE; } diff --git a/include/wx/gtk1/dialog.h b/include/wx/gtk1/dialog.h index 2d33f945d0..745acbf518 100644 --- a/include/wx/gtk1/dialog.h +++ b/include/wx/gtk1/dialog.h @@ -74,8 +74,6 @@ public: virtual bool IsModal() const; void SetModal( bool modal ); - virtual void InitDialog(void); - virtual void SetIcon( const wxIcon &icon ); virtual void Iconize( bool WXUNUSED(iconize)) { } virtual bool IsIconized() const { return FALSE; } diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp index aa5e3ec426..249c75e9d6 100644 --- a/src/generic/panelg.cpp +++ b/src/generic/panelg.cpp @@ -82,16 +82,9 @@ wxPanel::~wxPanel() } // ---------------------------------------------------------------------------- -// misc +// event handlers // ---------------------------------------------------------------------------- -void wxPanel::InitDialog() -{ - wxInitDialogEvent event(GetId()); - event.SetEventObject(this); - GetEventHandler()->ProcessEvent(event); -} - // Responds to colour changes, and passes event on to children. void wxPanel::OnSysColourChanged(wxSysColourChangedEvent& event) { diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp index a4532f5d19..45a20f012b 100644 --- a/src/gtk/dialog.cpp +++ b/src/gtk/dialog.cpp @@ -678,11 +678,6 @@ void wxDialog::EndModal( int retCode ) Show( FALSE ); } -void wxDialog::InitDialog() -{ - wxWindow::InitDialog(); -} - void wxDialog::SetIcon( const wxIcon &icon ) { m_icon = icon; diff --git a/src/gtk1/dialog.cpp b/src/gtk1/dialog.cpp index a4532f5d19..45a20f012b 100644 --- a/src/gtk1/dialog.cpp +++ b/src/gtk1/dialog.cpp @@ -678,11 +678,6 @@ void wxDialog::EndModal( int retCode ) Show( FALSE ); } -void wxDialog::InitDialog() -{ - wxWindow::InitDialog(); -} - void wxDialog::SetIcon( const wxIcon &icon ) { m_icon = icon; -- 2.47.2