- bool hasAbortButton = (style & wxPD_CAN_ABORT) != 0;
- m_state = hasAbortButton ? Continue : Uncancelable;
- m_disableParentOnly = (style & wxPD_APP_MODAL) == 0;
- m_parent = parent;
- m_maximum = maximum;
-
- wxFrame::Create(m_parent, -1, title);
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
-
- wxLayoutConstraints *c;
-
- m_msg = new wxStaticText(this, -1, message);
- c = new wxLayoutConstraints;
- c->left.SameAs(this, wxLeft, 10);
- c->top.SameAs(this, wxTop, 10);
- c->width.AsIs();
- c->height.AsIs();
- m_msg->SetConstraints(c);
-
- if ( maximum > 0 )
- {
- m_gauge = new wxGauge(this, -1, maximum,
- wxDefaultPosition, wxDefaultSize,
- wxGA_HORIZONTAL | wxRAISED_BORDER);
- c = new wxLayoutConstraints;
- c->left.SameAs(this, wxLeft, 2*LAYOUT_X_MARGIN);
- c->top.Below(m_msg, 2*LAYOUT_Y_MARGIN);
- c->right.SameAs(this, wxRight, 2*LAYOUT_X_MARGIN);
- c->height.AsIs();
- m_gauge->SetConstraints(c);
- m_gauge->SetValue(0);
- }
- else
- m_gauge = (wxGauge *)NULL;
-
- if ( hasAbortButton )
- {
- m_btnAbort = new wxButton(this, -1, _("Cancel"));
- c = new wxLayoutConstraints;
- c->centreX.SameAs(this, wxCentreX);
- if(m_gauge)
- c->top.Below(m_gauge, 2*LAYOUT_Y_MARGIN);
- else
- c->top.Below(m_btnAbort, 2*LAYOUT_Y_MARGIN);
- c->width.AsIs();
- c->height.AsIs();
- m_btnAbort->SetConstraints(c);
- }
- else
- m_btnAbort = (wxButton *)NULL;
-
- SetAutoLayout(TRUE);
- Layout();
-
- // calc the height of the dialog
- Fit();
- // and set the width from it
- wxSize size = GetClientSize();
- SetClientSize(2*size.y, size.y);
-
- Show(TRUE);
- Centre(wxCENTER_FRAME | wxBOTH);
-
- if(m_disableParentOnly)
- m_parent->Enable(FALSE);
- else
- wxEnableTopLevelWindows(FALSE);
-
- Enable(TRUE); // enable this window
- wxYield();
+ m_windowStyle |= style;
+
+ bool hasAbortButton = (style & wxPD_CAN_ABORT) != 0;
+ m_state = hasAbortButton ? Continue : Uncancelable;
+ m_maximum = maximum;
+
+ m_parentTop = parent;
+ while ( m_parentTop && m_parentTop->GetParent() )
+ {
+ m_parentTop = m_parentTop->GetParent();
+ }
+
+ wxLayoutConstraints *c;
+
+ wxClientDC dc(this);
+ dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+ long widthText;
+ dc.GetTextExtent(message, &widthText, NULL, NULL, NULL, NULL);
+
+ m_msg = new wxStaticText(this, -1, message);
+ c = new wxLayoutConstraints;
+ c->left.SameAs(this, wxLeft, 2*LAYOUT_X_MARGIN);
+ c->top.SameAs(this, wxTop, 2*LAYOUT_Y_MARGIN);
+ c->width.AsIs();
+ c->height.AsIs();
+ m_msg->SetConstraints(c);
+
+ wxSize sizeDlg, sizeLabel = m_msg->GetSize();
+ sizeDlg.y = 2*LAYOUT_Y_MARGIN + sizeLabel.y;
+
+ wxWindow *lastWindow = m_msg;
+
+ if ( maximum > 0 )
+ {
+ m_gauge = new wxGauge(this, -1, maximum,
+ wxDefaultPosition, wxDefaultSize,
+ wxGA_HORIZONTAL | wxRAISED_BORDER);
+// Sorry, but wxGA_SMOOTH happens to also mean wxDIALOG_MODAL and will
+// cause the dialog to be modal. Have an extra style argument to wxProgressDialog,
+// perhaps.
+// wxGA_HORIZONTAL | wxRAISED_BORDER | (style & wxGA_SMOOTH));
+ c = new wxLayoutConstraints;
+ c->left.SameAs(this, wxLeft, 2*LAYOUT_X_MARGIN);
+ c->top.Below(m_msg, 2*LAYOUT_Y_MARGIN);
+ c->right.SameAs(this, wxRight, 2*LAYOUT_X_MARGIN);
+ c->height.AsIs();
+ m_gauge->SetConstraints(c);
+ m_gauge->SetValue(0);
+ lastWindow = m_gauge;
+
+ wxSize sizeGauge = m_gauge->GetSize();
+ sizeDlg.y += 2*LAYOUT_Y_MARGIN + sizeGauge.y;
+ }
+ else
+ m_gauge = (wxGauge *)NULL;
+
+ // create the estimated/remaining/total time zones if requested
+ m_elapsed = m_estimated = m_remaining = (wxStaticText*)NULL;
+
+ int nTimeLabels = 0;
+ if ( style & wxPD_ELAPSED_TIME )
+ {
+ nTimeLabels++;
+
+ m_elapsed = CreateLabel(_("Elapsed time : "), &lastWindow);
+ }
+
+ if ( style & wxPD_ESTIMATED_TIME )
+ {
+ nTimeLabels++;
+
+ m_estimated = CreateLabel(_("Estimated time : "), &lastWindow);
+ }
+
+ if ( style & wxPD_REMAINING_TIME )
+ {
+ nTimeLabels++;
+
+ m_remaining = CreateLabel(_("Remaining time : "), &lastWindow);
+ }
+
+ if ( nTimeLabels > 0 )
+ {
+ // set it to the current time
+ m_timeStart = wxGetCurrentTime();
+ sizeDlg.y += nTimeLabels * (sizeLabel.y + LAYOUT_Y_MARGIN);
+ }
+
+ if ( hasAbortButton )
+ {
+ m_btnAbort = new wxButton(this, wxID_CANCEL, _("Cancel"));
+ c = new wxLayoutConstraints;
+
+ // Windows dialogs usually have buttons in the lower right corner
+#ifdef __WXMSW__
+ c->right.SameAs(this, wxRight, 2*LAYOUT_X_MARGIN);
+#else // !MSW
+ c->centreX.SameAs(this, wxCentreX);
+#endif // MSW/!MSW
+ c->bottom.SameAs(this, wxBottom, 2*LAYOUT_Y_MARGIN);
+
+ wxSize sizeBtn = wxButton::GetDefaultSize();
+ c->width.Absolute(sizeBtn.x);
+ c->height.Absolute(sizeBtn.y);
+
+ m_btnAbort->SetConstraints(c);
+
+ sizeDlg.y += 2*LAYOUT_Y_MARGIN + sizeBtn.y;
+ }
+ else
+ m_btnAbort = (wxButton *)NULL;
+
+ SetAutoLayout(TRUE);
+ Layout();
+
+ sizeDlg.y += 2*LAYOUT_Y_MARGIN;
+
+ // try to make the dialog not square but rectangular of reasonabel width
+ sizeDlg.x = (wxCoord)wxMax(widthText, 4*sizeDlg.y/3);
+ sizeDlg.x *= 3;
+ sizeDlg.x /= 2;
+ SetClientSize(sizeDlg);
+
+ Centre(wxCENTER_FRAME | wxBOTH);
+
+ if ( style & wxPD_APP_MODAL )
+ {
+ m_winDisabler = new wxWindowDisabler(this);
+ }
+ else
+ {
+ if ( m_parentTop )
+ m_parentTop->Enable(FALSE);
+ m_winDisabler = NULL;
+ }
+
+ Show(TRUE);
+ Enable(TRUE); // enable this window
+
+ // Update the display (especially on X, GTK)
+ wxYield();
+
+#ifdef __WXMAC__
+ MacUpdateImmediately();
+#endif