partial update from gtk/changes.txt

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

diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp
index 4fc3c975424a95d8fc7644fd4327fd23f45656d0..0e4c493c4368092b13861833669c1eb1ac1cd846 100644 (file)
--- a/src/generic/progdlgg.cpp
+++ b/src/generic/progdlgg.cpp
@@ -89,11 +89,14 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
                                    int style)
                 : wxDialog(parent, -1, title)
 {
+    // we may disappear at any moment, let the others know about it
+    SetExtraStyle(GetExtraStyle() | wxWS_EX_TRANSIENT);
+
     m_windowStyle |= style;
 
     bool hasAbortButton = (style & wxPD_CAN_ABORT) != 0;
 
-#ifdef __WXMSW__
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
     // we have to remove the "Close" button from the title bar then as it is
     // confusing to have it - it doesn't work anyhow
     //
@@ -107,6 +110,13 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
     m_state = hasAbortButton ? Continue : Uncancelable;
     m_maximum = maximum;
 
+#ifdef __WXMSW__
+    // we can't have values > 65,536 in the progress control under Windows, so
+    // scale everything down
+    m_factor = m_maximum / 65536 + 1;
+    m_maximum /= m_factor;
+#endif // __WXMSW__
+
     m_parentTop = parent;
     while ( m_parentTop && m_parentTop->GetParent() )
     {
@@ -116,7 +126,7 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
     wxLayoutConstraints *c;
 
     wxClientDC dc(this);
-    dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+    dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
     long widthText;
     dc.GetTextExtent(message, &widthText, NULL, NULL, NULL, NULL);
 
@@ -128,7 +138,8 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
     c->height.AsIs();
     m_msg->SetConstraints(c);
 
-    wxSize sizeDlg, sizeLabel = m_msg->GetSize();
+    wxSize sizeDlg,
+           sizeLabel = m_msg->GetSize();
     sizeDlg.y = 2*LAYOUT_Y_MARGIN + sizeLabel.y;
 
     wxWindow *lastWindow = m_msg;
@@ -138,7 +149,7 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
         // note that we can't use wxGA_SMOOTH because it happens to also mean
         // wxDIALOG_MODAL and will cause the dialog to be modal. Have an extra
         // style argument to wxProgressDialog, perhaps.
-        m_gauge = new wxGauge(this, -1, maximum,
+        m_gauge = new wxGauge(this, -1, m_maximum,
                               wxDefaultPosition, wxDefaultSize,
                               wxGA_HORIZONTAL);
 
@@ -160,11 +171,17 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
     // create the estimated/remaining/total time zones if requested
     m_elapsed = m_estimated = m_remaining = (wxStaticText*)NULL;
 
-    int nTimeLabels = 0;
+    // if we are going to have at least one label, remmeber it in this var
+    wxStaticText *label = NULL;
+
+    // also count how many labels we really have
+    size_t nTimeLabels = 0;
+
     if ( style & wxPD_ELAPSED_TIME )
     {
         nTimeLabels++;
 
+        label =
         m_elapsed = CreateLabel(_("Elapsed time : "), &lastWindow);
     }
 
@@ -172,6 +189,7 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
     {
         nTimeLabels++;
 
+        label =
         m_estimated = CreateLabel(_("Estimated time : "), &lastWindow);
     }
 
@@ -179,6 +197,7 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
     {
         nTimeLabels++;
 
+        label =
         m_remaining = CreateLabel(_("Remaining time : "), &lastWindow);
     }
 
@@ -186,7 +205,7 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
     {
         // set it to the current time
         m_timeStart = wxGetCurrentTime();
-        sizeDlg.y += nTimeLabels * (sizeLabel.y + LAYOUT_Y_MARGIN);
+        sizeDlg.y += nTimeLabels * (label->GetSize().y + LAYOUT_Y_MARGIN);
     }
 
     if ( hasAbortButton )
@@ -293,19 +312,20 @@ bool
 wxProgressDialog::Update(int value, const wxString& newmsg)
 {
     wxASSERT_MSG( value == -1 || m_gauge, wxT("cannot update non existent dialog") );
+
+#ifdef __WXMSW__
+    value /= m_factor;
+#endif // __WXMSW__
+
     wxASSERT_MSG( value <= m_maximum, wxT("invalid progress value") );
 
     if ( m_gauge )
+    {
         m_gauge->SetValue(value + 1);
+    }
 
     if ( !newmsg.IsEmpty() )
     {
-#ifdef __WXMSW__
-        // this seems to be necessary or garbage is left when the new label is
-        // longer than the old one
-        m_msg->SetLabel(wxEmptyString);
-#endif // MSW
-
         m_msg->SetLabel(newmsg);
 
         wxYield();
@@ -322,33 +342,40 @@ wxProgressDialog::Update(int value, const wxString& newmsg)
         SetTimeLabel(remaining, m_remaining);
     }
 
-    if ( (value == m_maximum ) && !(GetWindowStyle() & wxPD_AUTO_HIDE) )
+    if ( (value == m_maximum ) )
     {
-        if ( m_btnAbort )
-        {
-            // tell the user what he should do...
-            m_btnAbort->SetLabel(_("Close"));
-        }
-#ifdef __WXMSW__
-        else // enable the close button to give the user a way to close the dlg
-        {
-            EnableCloseButton(TRUE);
-        }
-#endif // __WXMSW__
-
-        if ( !newmsg )
-        {
-            // also provide the finishing message if the application didn't
-            m_msg->SetLabel(_("Done."));
-        }
-
         // so that we return TRUE below and that out [Cancel] handler knew what
         // to do
         m_state = Finished;
+        if( !(GetWindowStyle() & wxPD_AUTO_HIDE) )
+        {
+            if ( m_btnAbort )
+            {
+                // tell the user what he should do...
+                m_btnAbort->SetLabel(_("Close"));
+            }
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
+            else // enable the close button to give the user a way to close the dlg
+            {
+                EnableCloseButton(TRUE);
+            }
+#endif // __WXMSW__
 
-        wxYield();
+            if ( !newmsg )
+            {
+                // also provide the finishing message if the application didn't
+                m_msg->SetLabel(_("Done."));
+            }
 
-        (void)ShowModal();
+            wxYield();
+
+            (void)ShowModal();
+        }
+        else
+        {
+            Hide();
+            ReenableOtherWindows();
+        }
     }
     else
     {