Rename delegates to try and stop name clashes, probably with wxWebKitCtrl.

[wxWidgets.git] / src / univ / dialog.cpp

diff --git a/src/univ/dialog.cpp b/src/univ/dialog.cpp
index f0f3d659c228c50bff92c392ada6356fce8a08e4..9adf6a99b8daa3cbbc223ffdb290d54d6f404be8 100644 (file)
--- a/src/univ/dialog.cpp
+++ b/src/univ/dialog.cpp
@@ -41,8 +41,6 @@ BEGIN_EVENT_TABLE(wxDialog,wxDialogBase)
     EVT_CLOSE   (wxDialog::OnCloseWindow)
 END_EVENT_TABLE()
 
     EVT_CLOSE   (wxDialog::OnCloseWindow)
 END_EVENT_TABLE()
 

-IMPLEMENT_DYNAMIC_CLASS(wxDialog,wxTopLevelWindow)
-

 void wxDialog::Init()
 {
     m_returnCode = 0;
 void wxDialog::Init()
 {
     m_returnCode = 0;


@@ -143,11 +141,7 @@ bool wxDialog::Show(bool show)
         // if we had disabled other app windows, reenable them back now because
         // if they stay disabled Windows will activate another window (one
         // which is enabled, anyhow) and we will lose activation
         // if we had disabled other app windows, reenable them back now because
         // if they stay disabled Windows will activate another window (one
         // which is enabled, anyhow) and we will lose activation

-        if ( m_windowDisabler )
-        {
-            delete m_windowDisabler;
-            m_windowDisabler = NULL;
-        }
+        wxDELETE(m_windowDisabler);

 
         if ( IsModal() )
             EndModal(wxID_CANCEL);
 
         if ( IsModal() )
             EndModal(wxID_CANCEL);


@@ -179,13 +173,10 @@ int wxDialog::ShowModal()
 
     // use the apps top level window as parent if none given unless explicitly
     // forbidden
 
     // use the apps top level window as parent if none given unless explicitly
     // forbidden

-    if ( !GetParent() && !(GetWindowStyleFlag() & wxDIALOG_NO_PARENT) )
+    wxWindow * const parent = GetParentForModalDialog();
+    if ( parent && parent != this )

     {
     {

-        wxWindow * const parent = GetParentForModalDialog();
-        if ( parent && parent != this )
-        {
-            m_parent = parent;
-        }
+        m_parent = parent;

     }
 
     Show(true);
     }
 
     Show(true);