Fixed some warnings

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

diff --git a/src/motif/dialog.cpp b/src/motif/dialog.cpp
index 3955a68d4536e6385f011764ffde4e670c3f7e42..a63aca7d3fc7c0248eef870ce51f429fde9baa50 100644 (file)
--- a/src/motif/dialog.cpp
+++ b/src/motif/dialog.cpp
@@ -21,6 +21,7 @@
 #endif
 
 #include "wx/evtloop.h"
 #endif
 
 #include "wx/evtloop.h"

+#include "wx/testing.h"

 
 #ifdef __VMS__
 #pragma message disable nosimpint
 
 #ifdef __VMS__
 #pragma message disable nosimpint


@@ -62,8 +63,6 @@ extern wxList wxModelessWindows;  // Frames and modeless dialogs
 
 #define wxUSE_INVISIBLE_RESIZE 1
 
 
 #define wxUSE_INVISIBLE_RESIZE 1
 

-IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
-

 wxDialog::wxDialog()
 {
     m_modalShowing = false;
 wxDialog::wxDialog()
 {
     m_modalShowing = false;


@@ -181,7 +180,7 @@ void wxDialog::SetModal(bool flag)
 
 wxDialog::~wxDialog()
 {
 
 wxDialog::~wxDialog()
 {

-    m_isBeingDeleted = true;
+    SendDestroyEvent();

 
     // if the dialog is modal, this will end its event loop
     Show(false);
 
     // if the dialog is modal, this will end its event loop
     Show(false);


@@ -290,6 +289,8 @@ bool wxDialog::Show( bool show )
 // Shows a dialog modally, returning a return code
 int wxDialog::ShowModal()
 {
 // Shows a dialog modally, returning a return code
 int wxDialog::ShowModal()
 {

+    WX_TESTING_SHOW_MODAL_HOOK();
+

     Show(true);
 
     // after the event loop ran, the widget might already have been destroyed
     Show(true);
 
     // after the event loop ran, the widget might already have been destroyed


@@ -307,8 +308,7 @@ int wxDialog::ShowModal()
     // Now process all events in case they get sent to a destroyed dialog
     wxFlushEvents( display );
 
     // Now process all events in case they get sent to a destroyed dialog
     wxFlushEvents( display );
 

-    delete m_eventLoop;
-    m_eventLoop = NULL;
+    wxDELETE(m_eventLoop);

 
     // TODO: is it safe to call this, if the dialog may have been deleted
     // by now? Probably only if we're using delayed deletion of dialogs.
 
     // TODO: is it safe to call this, if the dialog may have been deleted
     // by now? Probably only if we're using delayed deletion of dialogs.