X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4e2a3778386d60356dab319afa2d3f987f86d6b2..c3e57ac4ac9222d84ac208a493b57fb24e474a6a:/src/msw/dialog.cpp

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index b0703f2291..f65ece0b5d 100644
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -283,8 +283,7 @@ void wxDialog::Raise()
 // show dialog modally
 int wxDialog::ShowModal()
 {
-    wxASSERT_MSG(!IsShown(),
-                 _T("ShowModal() can't be called for an already shown dialog"));
+    wxASSERT_MSG( !IsModal(), _T("ShowModal() can't be called twice") );
 
     m_endModalCalled = false;
 
@@ -392,8 +391,11 @@ void wxDialog::DestroyGripper()
     {
         // we used to have trouble with gripper appearing on top (and hence
         // overdrawing) the other, real, dialog children -- check that this
-        // isn't the case automatically
-        wxASSERT_MSG( ::GetNextWindow((HWND)m_hGripper, GW_HWNDNEXT) == 0,
+        // isn't the case automatically (but notice that this could be false if
+        // we're not shown at all as in this case ResizeGripper() might not
+        // have been called yet)
+        wxASSERT_MSG( !IsShown() ||
+                      ::GetNextWindow((HWND)m_hGripper, GW_HWNDNEXT) == 0,
             _T("Bug in wxWidgets: gripper should be at the bottom of Z-order") );
         ::DestroyWindow((HWND) m_hGripper);
         m_hGripper = 0;