Updates for 2.3.1; fixed syntax error in makefile.b32 but this probably

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

diff --git a/src/mac/dialog.cpp b/src/mac/dialog.cpp
index 760c07680a91543be3bb019f8eba670f2e08b247..044002d970b1076ba6d8c912a834b55152996b82 100644 (file)
--- a/src/mac/dialog.cpp
+++ b/src/mac/dialog.cpp
@@ -215,6 +215,7 @@ void wxDialog::DoShowModal()
     }
        // TODO : test whether parent gets disabled
 
     }
        // TODO : test whether parent gets disabled
 

+       bool formerModal = s_macIsInModalLoop ;

        s_macIsInModalLoop = true ;
 
        while ( IsModalShowing() )
        s_macIsInModalLoop = true ;
 
        while ( IsModalShowing() )


@@ -225,7 +226,7 @@ void wxDialog::DoShowModal()
                wxTheApp->MacDoOneEvent() ;
        }
        
                wxTheApp->MacDoOneEvent() ;
        }
        

-       s_macIsInModalLoop = false ;
+       s_macIsInModalLoop = formerModal ;

 
     // TODO probably reenable the parent window if any
 
 
     // TODO probably reenable the parent window if any