removed redundant InitDialog methods

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11374 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h
index cf5685d9489df58d667b09422f7ee2ed471c60e4..dfda5d8ef0786838ad9a11ce35c1db6b4a382059 100644 (file)
--- a/include/wx/generic/panelg.h
+++ b/include/wx/generic/panelg.h
@@ -73,10 +73,6 @@ public:
     // implementation from now on
     // --------------------------
 
     // 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);
 
         // responds to colour changes
     void OnSysColourChanged(wxSysColourChangedEvent& event);
 

diff --git a/include/wx/gtk/dialog.h b/include/wx/gtk/dialog.h
index 2d33f945d08186ab4560f5ce794af678cf07bc42..745acbf5185ad15fcb997912e464494f16a1a5ac 100644 (file)
--- 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 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; }
     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 2d33f945d08186ab4560f5ce794af678cf07bc42..745acbf5185ad15fcb997912e464494f16a1a5ac 100644 (file)
--- 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 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; }
     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 aa5e3ec4264920ca81122def6c939efcb98920b6..249c75e9d6b4401c2a6fd389d0b6a7b8e39da359 100644 (file)
--- 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)
 {
 // 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 a4532f5d190afc47433eef16476d21759edb0779..45a20f012b6735422ad431f715d6763154950ad4 100644 (file)
--- a/src/gtk/dialog.cpp
+++ b/src/gtk/dialog.cpp
@@ -678,11 +678,6 @@ void wxDialog::EndModal( int retCode )
     Show( FALSE );
 }
 
     Show( FALSE );
 }
 

-void wxDialog::InitDialog()
-{
-    wxWindow::InitDialog();
-}
-

 void wxDialog::SetIcon( const wxIcon &icon )
 {
     m_icon = icon;
 void wxDialog::SetIcon( const wxIcon &icon )
 {
     m_icon = icon;

diff --git a/src/gtk1/dialog.cpp b/src/gtk1/dialog.cpp
index a4532f5d190afc47433eef16476d21759edb0779..45a20f012b6735422ad431f715d6763154950ad4 100644 (file)
--- a/src/gtk1/dialog.cpp
+++ b/src/gtk1/dialog.cpp
@@ -678,11 +678,6 @@ void wxDialog::EndModal( int retCode )
     Show( FALSE );
 }
 
     Show( FALSE );
 }
 

-void wxDialog::InitDialog()
-{
-    wxWindow::InitDialog();
-}
-

 void wxDialog::SetIcon( const wxIcon &icon )
 {
     m_icon = icon;
 void wxDialog::SetIcon( const wxIcon &icon )
 {
     m_icon = icon;