fix for losing focus under Windows after showing the progress dialog

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp
index d59ecc17983f7375f33e17f7d2df71096088df0d..ee3323037a8d4134d98a2bc1cd40cea6289755f4 100644 (file)
--- a/src/generic/progdlgg.cpp
+++ b/src/generic/progdlgg.cpp
@@ -268,7 +268,11 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
 
     // Update the display (especially on X, GTK)
     wxYield();
 
     // Update the display (especially on X, GTK)
     wxYield();

+
+    // FIXME: shouldn't be needed
+#ifdef __WXX11__

     wxYield();
     wxYield();

+#endif

 
 #ifdef __WXMAC__
     MacUpdateImmediately();
 
 #ifdef __WXMAC__
     MacUpdateImmediately();


@@ -333,7 +337,11 @@ wxProgressDialog::Update(int value, const wxString& newmsg)
         m_msg->SetLabel(newmsg);
 
         wxYield();
         m_msg->SetLabel(newmsg);
 
         wxYield();

+
+        // FIXME: shouldn't be needed
+#ifdef __WXX11__

         wxYield();
         wxYield();

+#endif

     }
 
     if ( (m_elapsed || m_remaining || m_estimated) && (value != 0) )
     }
 
     if ( (m_elapsed || m_remaining || m_estimated) && (value != 0) )


@@ -347,7 +355,7 @@ wxProgressDialog::Update(int value, const wxString& newmsg)
         SetTimeLabel(remaining, m_remaining);
     }
 
         SetTimeLabel(remaining, m_remaining);
     }
 

-    if ( (value == m_maximum ) )
+    if ( value == m_maximum )

     {
         // so that we return TRUE below and that out [Cancel] handler knew what
         // to do
     {
         // so that we return TRUE below and that out [Cancel] handler knew what
         // to do


@@ -360,7 +368,7 @@ wxProgressDialog::Update(int value, const wxString& newmsg)
                 m_btnAbort->SetLabel(_("Close"));
             }
 #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
                 m_btnAbort->SetLabel(_("Close"));
             }
 #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)

-            else // enable the close button to give the user a way to close the dlg
+            else // enable the button to give the user a way to close the dlg

             {
                 EnableCloseButton(TRUE);
             }
             {
                 EnableCloseButton(TRUE);
             }


@@ -373,21 +381,33 @@ wxProgressDialog::Update(int value, const wxString& newmsg)
             }
 
             wxYield();
             }
 
             wxYield();

+
+            // FIXME: shouldn't be needed
+#ifdef __WXX11__

             wxYield();
             wxYield();

+#endif

 
             (void)ShowModal();
         }
 
             (void)ShowModal();
         }

-        else
+        else // auto hide

         {
         {

-            Hide();
+            // reenable other windows before hiding this one because otherwise
+            // Windows wouldn't give the focus back to the window which had
+            // been previously focused because it would still be disabled

             ReenableOtherWindows();
             ReenableOtherWindows();

+
+            Hide();

         }
     }
     else
     {
         // update the display
         wxYield();
         }
     }
     else
     {
         // update the display
         wxYield();

+
+        // FIXME: shouldn't be needed
+#ifdef __WXX11__

         wxYield();
         wxYield();

+#endif

     }
 
 #ifdef __WXMAC__
     }
 
 #ifdef __WXMAC__