SVN Commit by dpage: r4581 - in trunk/pgadmin3: . src/main

Author: dpage
Date: 2005-10-20 15:25:35 +0100 (Thu, 20 Oct 2005)
New Revision: 4581

Modified:
   trunk/pgadmin3/CHANGELOG.txt
   trunk/pgadmin3/src/main/dlgClasses.cpp
Log:
Ensure the user can cancel the maintenance dialogue when it is running.

Modified: trunk/pgadmin3/CHANGELOG.txt
===================================================================
--- trunk/pgadmin3/CHANGELOG.txt    2005-10-20 14:12:45 UTC (rev 4580)
+++ trunk/pgadmin3/CHANGELOG.txt    2005-10-20 14:25:35 UTC (rev 4581)
@@ -17,6 +17,8 @@
 </ul>
 <br>
 <ul>
+<<<<<<< .mine
+    <li>2005-10-20 DP  1.4B4 Ensure the user can cancel the maintenance dialogue when it is running.
     <li>2005-10-20 DP  1.4B4 Fix the recent files list on the config file editor. (r: Miha Radej)
     <li>2005-10-18 DP  1.4B3 Correct font size on Splash and About forms on Mac.
     <li>2005-10-18 AP  1.4B3 Prevent refresh of the servers treeview node

Modified: trunk/pgadmin3/src/main/dlgClasses.cpp
===================================================================
--- trunk/pgadmin3/src/main/dlgClasses.cpp    2005-10-20 14:12:45 UTC (rev 4580)
+++ trunk/pgadmin3/src/main/dlgClasses.cpp    2005-10-20 14:25:35 UTC (rev 4581)
@@ -449,7 +449,7 @@
             // here could be the animation
             if (txtMessages)
                 txtMessages->AppendText(thread->GetMessagesAndClear());
-            wxSafeYield();
+            wxSafeYield(this);
         }

         if (thread)