fixing release handling of dc

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

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index 9d28a6e039b52c7f525661fd99fec7dca691ee20..f65ece0b5d2fb9a35f11e7f8d3ecbf003e54ecd6 100644 (file)
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -283,7 +283,7 @@ void wxDialog::Raise()
 // show dialog modally
 int wxDialog::ShowModal()
 {
 // show dialog modally
 int wxDialog::ShowModal()
 {

-    wxASSERT_MSG( !IsModal(), _T("wxDialog::ShowModal() reentered?") );
+    wxASSERT_MSG( !IsModal(), _T("ShowModal() can't be called twice") );

 
     m_endModalCalled = false;
 
 
     m_endModalCalled = false;
 


@@ -391,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
     {
         // 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;
             _T("Bug in wxWidgets: gripper should be at the bottom of Z-order") );
         ::DestroyWindow((HWND) m_hGripper);
         m_hGripper = 0;