BEGIN_EVENT_TABLE(wxProgressDialog, wxDialog)
EVT_BUTTON(wxID_CANCEL, wxProgressDialog::OnCancel)
- EVT_SHOW(wxProgressDialog::OnShow)
-
EVT_CLOSE(wxProgressDialog::OnClose)
END_EVENT_TABLE()
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
//
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() )
{
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);
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;
// 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);
// 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);
}
{
nTimeLabels++;
+ label =
m_estimated = CreateLabel(_("Estimated time : "), &lastWindow);
}
{
nTimeLabels++;
+ label =
m_remaining = CreateLabel(_("Remaining time : "), &lastWindow);
}
{
// 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 )
#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);
+ c->width.AsIs();
+ c->height.AsIs();
m_btnAbort->SetConstraints(c);
- sizeDlg.y += 2*LAYOUT_Y_MARGIN + sizeBtn.y;
+ sizeDlg.y += 2*LAYOUT_Y_MARGIN + wxButton::GetDefaultSize().y;
}
- else
+ else // no "Cancel" button
+ {
m_btnAbort = (wxButton *)NULL;
+ }
SetAutoLayout(TRUE);
Layout();
// Update the display (especially on X, GTK)
wxYield();
+ wxYield();
#ifdef __WXMAC__
MacUpdateImmediately();
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();
+ wxYield();
}
if ( (m_elapsed || m_remaining || m_estimated) && (value != 0) )
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."));
+ }
+
+ wxYield();
+ wxYield();
- (void)ShowModal();
+ (void)ShowModal();
+ }
+ else
+ {
+ Hide();
+ ReenableOtherWindows();
+ }
}
else
{
// update the display
wxYield();
+ wxYield();
}
#ifdef __WXMAC__
}
}
-void wxProgressDialog::OnShow(wxShowEvent& event)
-{
- // if the dialog is being hidden, it was closed, so reenable other windows
- // now
- if ( event.GetShow() )
- {
- ReenableOtherWindows();
- }
-}
-
// ----------------------------------------------------------------------------
// destruction
// ----------------------------------------------------------------------------
projects / wxWidgets.git / blobdiff