made GetColourFromGTKWidget() more general, it is now used for all colours

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

diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp
index da963d14fd80e91578ec4cdbd4f85092aece23ab..4fc3c975424a95d8fc7644fd4327fd23f45656d0 100644 (file)
--- a/src/generic/progdlgg.cpp
+++ b/src/generic/progdlgg.cpp
@@ -166,7 +166,6 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
         nTimeLabels++;
 
         m_elapsed = CreateLabel(_("Elapsed time : "), &lastWindow);
-        SetTimeLabel(0, m_elapsed);
     }
 
     if ( style & wxPD_ESTIMATED_TIME )
@@ -241,6 +240,14 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
     Show(TRUE);
     Enable(TRUE); // enable this window
 
+    // this one can be initialized even if the others are unknown for now
+    //
+    // NB: do it after calling Layout() to keep the labels correctly aligned
+    if ( m_elapsed )
+    {
+        SetTimeLabel(0, m_elapsed);
+    }
+
     // Update the display (especially on X, GTK)
     wxYield();