(probably) fixed wxLocale::Init with Borland C++

[wxWidgets.git] / src / generic / progdlgg.cpp

diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp
index d59ecc17983f7375f33e17f7d2df71096088df0d..c99c98dac7673c49c586784b0f6d7d44ed940218 100644 (file)
--- a/src/generic/progdlgg.cpp
+++ b/src/generic/progdlgg.cpp
@@ -268,7 +268,6 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
 
     // Update the display (especially on X, GTK)
     wxYield();
-    wxYield();
 
 #ifdef __WXMAC__
     MacUpdateImmediately();
@@ -323,7 +322,7 @@ wxProgressDialog::Update(int value, const wxString& newmsg)
 
     wxASSERT_MSG( value <= m_maximum, wxT("invalid progress value") );
 
-    if ( m_gauge )
+    if ( m_gauge && value < m_maximum )
     {
         m_gauge->SetValue(value + 1);
     }
@@ -333,7 +332,6 @@ wxProgressDialog::Update(int value, const wxString& newmsg)
         m_msg->SetLabel(newmsg);
 
         wxYield();
-        wxYield();
     }
 
     if ( (m_elapsed || m_remaining || m_estimated) && (value != 0) )
@@ -347,7 +345,7 @@ wxProgressDialog::Update(int value, const wxString& newmsg)
         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
@@ -360,7 +358,7 @@ wxProgressDialog::Update(int value, const wxString& newmsg)
                 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);
             }
@@ -372,22 +370,24 @@ wxProgressDialog::Update(int value, const wxString& newmsg)
                 m_msg->SetLabel(_("Done."));
             }
 
-            wxYield();
             wxYield();
 
             (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();
+
+            Hide();
         }
     }
     else
     {
         // update the display
         wxYield();
-        wxYield();
     }
 
 #ifdef __WXMAC__
@@ -406,6 +406,17 @@ void wxProgressDialog::Resume()
     m_btnAbort->Enable();
 }
 
+bool wxProgressDialog::Show( bool show )
+{
+    // 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
+    if(!show)
+        ReenableOtherWindows();
+
+    return wxDialog::Show(show);
+}
+
 // ----------------------------------------------------------------------------
 // event handlers
 // ----------------------------------------------------------------------------