Fix minor typo in wxDV_VERT_RULES documentation.

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

diff --git a/src/os2/dialog.cpp b/src/os2/dialog.cpp
index a8f0d6f9d154bb41944d5443e14fa02b05c1e21b..7b1b0d0ce13d33d996a47f900589a8a17cca25aa 100644 (file)
--- a/src/os2/dialog.cpp
+++ b/src/os2/dialog.cpp
@@ -26,6 +26,7 @@
 #include "wx/os2/private.h"
 #include "wx/evtloop.h"
 #include "wx/scopedptr.h"
+#include "wx/testing.h"
 
 #define wxDIALOG_DEFAULT_X 300
 #define wxDIALOG_DEFAULT_Y 300
@@ -33,7 +34,6 @@
 #define wxDIALOG_DEFAULT_WIDTH 500
 #define wxDIALOG_DEFAULT_HEIGHT 500
 
-IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
 
 // ----------------------------------------------------------------------------
 // wxDialogModalData
@@ -115,7 +115,7 @@ bool wxDialog::Create( wxWindow*       pParent,
     //
     // Must defer setting the title until after dialog is created and sized
     //
-    if (!rsTitle.IsNull())
+    if ( !rsTitle.empty() )
         SetTitle(rsTitle);
     return true;
 } // end of wxDialog::Create
@@ -180,11 +180,7 @@ bool wxDialog::Show( bool bShow )
         // and we will lose activation
         m_modalData->ExitLoop();
 #if 0
-        if (m_pWindowDisabler)
-        {
-            delete m_pWindowDisabler;
-            m_pWindowDisabler = NULL;
-        }
+        wxDELETE(m_pWindowDisabler);
 #endif
     }
 
@@ -224,6 +220,8 @@ bool wxDialog::Show( bool bShow )
 //
 int wxDialog::ShowModal()
 {
+    WX_TESTING_SHOW_MODAL_HOOK();
+
     wxASSERT_MSG( !IsModal(), wxT("wxDialog::ShowModal() reentered?") );
 
     m_endModalCalled = false;