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
//
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();
// 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);