projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wxDialog change (Show() completely rewritten, modal dialogs handling changed)
[wxWidgets.git]
/
src
/
generic
/
progdlgg.cpp
diff --git
a/src/generic/progdlgg.cpp
b/src/generic/progdlgg.cpp
index 46f42696d98a7d58f1abe2e1641cf3365eef3346..34890e763ce17c70c987bc942ca7a9976f70470a 100644
(file)
--- a/
src/generic/progdlgg.cpp
+++ b/
src/generic/progdlgg.cpp
@@
-64,14
+64,12
@@
static void SetTimeLabel(unsigned long val, wxStaticText *label);
// event tables
// ----------------------------------------------------------------------------
// 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
// ============================================================================
// implementation
@@
-126,7
+124,7
@@
wxProgressDialog::wxProgressDialog(wxString const &title,
{
m_gauge = new wxGauge(this, -1, maximum,
wxDefaultPosition, wxDefaultSize,
{
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);
c = new wxLayoutConstraints;
c->left.SameAs(this, wxLeft, 2*LAYOUT_X_MARGIN);
c->top.Below(m_msg, 2*LAYOUT_Y_MARGIN);
@@
-150,28
+148,27
@@
wxProgressDialog::wxProgressDialog(wxString const &title,
{
nTimeLabels++;
{
nTimeLabels++;
- m_elapsed = CreateLabel(
wxT
("Elapsed time : "), &lastWindow);
+ m_elapsed = CreateLabel(
_
("Elapsed time : "), &lastWindow);
}
if ( style & wxPD_ESTIMATED_TIME )
{
nTimeLabels++;
}
if ( style & wxPD_ESTIMATED_TIME )
{
nTimeLabels++;
- m_estimated = CreateLabel(
wxT
("Estimated time : "), &lastWindow);
+ m_estimated = CreateLabel(
_
("Estimated time : "), &lastWindow);
}
if ( style & wxPD_REMAINING_TIME )
{
nTimeLabels++;
}
if ( style & wxPD_REMAINING_TIME )
{
nTimeLabels++;
- m_remaining = CreateLabel(
wxT
("Remaining time : "), &lastWindow);
+ m_remaining = CreateLabel(
_
("Remaining time : "), &lastWindow);
}
if ( nTimeLabels > 0 )
{
// set it to the current time
m_timeStart = wxGetCurrentTime();
}
if ( nTimeLabels > 0 )
{
// set it to the current time
m_timeStart = wxGetCurrentTime();
-
sizeDlg.y += nTimeLabels * (sizeLabel.y + LAYOUT_Y_MARGIN);
}
sizeDlg.y += nTimeLabels * (sizeLabel.y + LAYOUT_Y_MARGIN);
}
@@
-205,14
+202,14
@@
wxProgressDialog::wxProgressDialog(wxString const &title,
sizeDlg.y += 2*LAYOUT_Y_MARGIN;
// try to make the dialog not square but rectangular of reasonabel width
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);
sizeDlg.x *= 3;
sizeDlg.x /= 2;
SetClientSize(sizeDlg);
Centre(wxCENTER_FRAME | wxBOTH);
- if (m_disableParentOnly )
+ if (
m_disableParentOnly )
{
if ( m_parent )
m_parent->Enable(FALSE);
{
if ( m_parent )
m_parent->Enable(FALSE);
@@
-227,9
+224,10
@@
wxProgressDialog::wxProgressDialog(wxString const &title,
// Update the display (especially on X, GTK)
wxYield();
// Update the display (especially on X, GTK)
wxYield();
- #ifdef __WXMAC__
- MacUpdateImmediately() ;
- #endif
+
+#ifdef __WXMAC__
+ MacUpdateImmediately();
+#endif
}
wxStaticText *wxProgressDialog::CreateLabel(const wxString& text,
}
wxStaticText *wxProgressDialog::CreateLabel(const wxString& text,
@@
-237,7
+235,7
@@
wxStaticText *wxProgressDialog::CreateLabel(const wxString& text,
{
wxLayoutConstraints *c;
{
wxLayoutConstraints *c;
- wxStaticText *label = new wxStaticText(this, -1,
wxT
("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
c = new wxLayoutConstraints;
// VZ: I like the labels be centered - if the others don't mind, you may
@@
-316,9
+314,10
@@
wxProgressDialog::Update(int value, const wxString& newmsg)
// update the display
wxYield();
}
// update the display
wxYield();
}
- #ifdef __WXMAC__
- MacUpdateImmediately() ;
- #endif
+
+#ifdef __WXMAC__
+ MacUpdateImmediately();
+#endif
return m_state != Canceled;
}
return m_state != Canceled;
}
@@
-340,6
+339,10
@@
void wxProgressDialog::OnCancel(wxCommandEvent& event)
// request to cancel was received, the next time Update() is called we
// will handle it
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();
}
}
}
}