// event tables
// ----------------------------------------------------------------------------
-#if !USE_SHARED_LIBRARY
- BEGIN_EVENT_TABLE(wxProgressDialog, wxDialog)
- EVT_BUTTON(wxID_CANCEL, wxProgressDialog::OnCancel)
- EVT_CLOSE(wxProgressDialog::OnClose)
- END_EVENT_TABLE()
+BEGIN_EVENT_TABLE(wxProgressDialog, wxDialog)
+ EVT_BUTTON(wxID_CANCEL, wxProgressDialog::OnCancel)
+ EVT_CLOSE(wxProgressDialog::OnClose)
+END_EVENT_TABLE()
- IMPLEMENT_CLASS(wxProgressDialog, wxDialog)
-#endif
+IMPLEMENT_CLASS(wxProgressDialog, wxDialog)
// ============================================================================
// implementation
int style)
: wxDialog(parent, -1, title)
{
+ m_windowStyle = style;
+
bool hasAbortButton = (style & wxPD_CAN_ABORT) != 0;
m_state = hasAbortButton ? Continue : Uncancelable;
- m_disableParentOnly = (style & wxPD_APP_MODAL) == 0;
- m_AutoHide = (style & wxPD_AUTO_HIDE) != 0;
- m_parent = parent;
m_maximum = maximum;
+ m_parentTop = parent;
+ while ( m_parentTop && m_parentTop->GetParent() )
+ {
+ m_parentTop = m_parentTop->GetParent();
+ }
+
wxLayoutConstraints *c;
wxClientDC dc(this);
// have two versions of this in wxWindowDC tp avoid function hiding
// since there are two of these in wxDCBase, and in turn in wxDC.
// VA cannot resolve this so:
- dc.GetTextExtent(message, &widthText, NULL, NULL, NULL, NULL, FALSE);
+ dc.GetTextExtent(message, &widthText, NULL, NULL, NULL, NULL);
#else
- dc.GetTextExtent(message, &widthText, NULL);
+ dc.GetTextExtent(message, &widthText, (long*)NULL);
#endif
m_msg = new wxStaticText(this, -1, message);
{
m_gauge = new wxGauge(this, -1, maximum,
wxDefaultPosition, wxDefaultSize,
- wxGA_HORIZONTAL | wxRAISED_BORDER);
+ 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);
m_gauge = (wxGauge *)NULL;
// create the estimated/remaining/total time zones if requested
- m_elapsed = m_estimated = m_remaining = NULL;
+ m_elapsed = m_estimated = m_remaining = (wxStaticText*)NULL;
int nTimeLabels = 0;
if ( style & wxPD_ELAPSED_TIME )
{
nTimeLabels++;
- m_elapsed = CreateLabel(_T("Elapsed time : "), &lastWindow);
+ m_elapsed = CreateLabel(_("Elapsed time : "), &lastWindow);
}
if ( style & wxPD_ESTIMATED_TIME )
{
nTimeLabels++;
- m_estimated = CreateLabel(_T("Estimated time : "), &lastWindow);
+ m_estimated = CreateLabel(_("Estimated time : "), &lastWindow);
}
if ( style & wxPD_REMAINING_TIME )
{
nTimeLabels++;
- m_remaining = CreateLabel(_T("Remaining time : "), &lastWindow);
+ 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);
}
sizeDlg.y += 2*LAYOUT_Y_MARGIN;
// try to make the dialog not square but rectangular of reasonabel width
- sizeDlg.x = wxMax(widthText, 4*sizeDlg.y/3);
+ sizeDlg.x = (wxCoord)wxMax(widthText, 4*sizeDlg.y/3);
sizeDlg.x *= 3;
sizeDlg.x /= 2;
SetClientSize(sizeDlg);
Centre(wxCENTER_FRAME | wxBOTH);
- if (m_disableParentOnly )
+ if ( !(style & wxPD_APP_MODAL) )
{
- if ( m_parent )
- m_parent->Enable(FALSE);
+ if ( m_parentTop )
+ m_parentTop->Enable(FALSE);
}
else
{
Show(TRUE);
Enable(TRUE); // enable this window
+
+ // Update the display (especially on X, GTK)
+ wxYield();
+
+#ifdef __WXMAC__
+ MacUpdateImmediately();
+#endif
}
wxStaticText *wxProgressDialog::CreateLabel(const wxString& text,
{
wxLayoutConstraints *c;
- wxStaticText *label = new wxStaticText(this, -1, _T("unknown"));
+ wxStaticText *label = new wxStaticText(this, -1, _("unknown"));
c = new wxLayoutConstraints;
// VZ: I like the labels be centered - if the others don't mind, you may
bool
wxProgressDialog::Update(int value, const wxString& newmsg)
{
- wxASSERT_MSG( value == -1 || m_gauge, _T("cannot update non existent dialog") );
- wxASSERT_MSG( value <= m_maximum, _T("invalid progress value") );
-
-
- if( m_gauge )
- m_gauge->SetValue(value + 1);
-
- if( !newmsg.IsEmpty() )
- m_msg->SetLabel(newmsg);
-
- if ( (m_elapsed || m_remaining || m_estimated) && (value != 0) )
- {
- unsigned long elapsed = wxGetCurrentTime() - m_timeStart;
- unsigned long estimated = elapsed * m_maximum / value;
- unsigned long remaining = estimated - elapsed;
-
- SetTimeLabel(elapsed, m_elapsed);
- SetTimeLabel(estimated, m_estimated);
- SetTimeLabel(remaining, m_remaining);
- }
-
- if ( (value == m_maximum ) && !m_AutoHide )
- {
- if ( m_btnAbort )
- {
- // tell the user what he should do...
- m_btnAbort->SetLabel(_("Close"));
- }
-
- 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;
-
- wxYield();
-
- (void)ShowModal();
- }
- else
- {
- // update the display
- wxYield();
- }
-
- return m_state != Canceled;
+ wxASSERT_MSG( value == -1 || m_gauge, wxT("cannot update non existent dialog") );
+ 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();
+ }
+
+ if ( (m_elapsed || m_remaining || m_estimated) && (value != 0) )
+ {
+ unsigned long elapsed = wxGetCurrentTime() - m_timeStart;
+ unsigned long estimated = elapsed * m_maximum / value;
+ unsigned long remaining = estimated - elapsed;
+
+ SetTimeLabel(elapsed, m_elapsed);
+ SetTimeLabel(estimated, m_estimated);
+ SetTimeLabel(remaining, m_remaining);
+ }
+
+ if ( (value == m_maximum ) && !(GetWindowStyle() & wxPD_AUTO_HIDE) )
+ {
+ if ( m_btnAbort )
+ {
+ // tell the user what he should do...
+ m_btnAbort->SetLabel(_("Close"));
+ }
+
+ 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;
+
+ wxYield();
+
+ (void)ShowModal();
+ }
+ else
+ {
+ // update the display
+ wxYield();
+ }
+
+#ifdef __WXMAC__
+ MacUpdateImmediately();
+#endif
+
+ return m_state != Canceled;
}
// ----------------------------------------------------------------------------
// request to cancel was received, the next time Update() is called we
// will handle it
m_state = Canceled;
+
+ // update the button state immediately so that the user knows that the
+ // request has been noticed
+ m_btnAbort->Disable();
}
}
void wxProgressDialog::OnClose(wxCloseEvent& event)
{
if ( m_state == Uncancelable )
+ {
+ // can't close this dialog
event.Veto(TRUE);
+ }
+ else if ( m_state == Finished )
+ {
+ // let the default handler close the window as we already terminated
+ event.Skip();
+ }
else
+ {
+ // next Update() will notice it
m_state = Canceled;
+ }
}
// ----------------------------------------------------------------------------
wxProgressDialog::~wxProgressDialog()
{
- if ( m_disableParentOnly )
+ if ( !(GetWindowStyle() & wxPD_APP_MODAL) )
{
- if ( m_parent )
- m_parent->Enable(TRUE);
+ if ( m_parentTop )
+ m_parentTop->Enable(TRUE);
}
else
{
unsigned long hours = val / 3600;
unsigned long minutes = (val % 3600) / 60;
unsigned long seconds = val % 60;
- s.Printf(_T("%lu:%02lu:%02lu"), hours, minutes, seconds);
+ s.Printf(wxT("%lu:%02lu:%02lu"), hours, minutes, seconds);
if ( s != label->GetLabel() )
label->SetLabel(s);
projects / wxWidgets.git / blobdiff