Added style parameter to wxPopupWindow ctors so they match the Create method.

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

diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp
index 2153f420dd5084720f2eaba92c35d231edca6a6b..12a2aa179762458e2b88f8bee713d0d895fc4e12 100644 (file)
--- a/src/generic/progdlgg.cpp
+++ b/src/generic/progdlgg.cpp
@@ -93,7 +93,7 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
 
     bool hasAbortButton = (style & wxPD_CAN_ABORT) != 0;
 
 
     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
     //
     // we have to remove the "Close" button from the title bar then as it is
     // confusing to have it - it doesn't work anyhow
     //


@@ -240,6 +240,14 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
     Show(TRUE);
     Enable(TRUE); // enable this window
 
     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();
 
     // Update the display (especially on X, GTK)
     wxYield();
 


@@ -321,7 +329,7 @@ wxProgressDialog::Update(int value, const wxString& newmsg)
             // tell the user what he should do...
             m_btnAbort->SetLabel(_("Close"));
         }
             // tell the user what he should do...
             m_btnAbort->SetLabel(_("Close"));
         }

-#ifdef __WXMSW__
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)

         else // enable the close button to give the user a way to close the dlg
         {
             EnableCloseButton(TRUE);
         else // enable the close button to give the user a way to close the dlg
         {
             EnableCloseButton(TRUE);