Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. warning in wxDataObject fixed

Browse Source 
2. wxProgressDialog got a new style flag and updated docs


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2582 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-05-27 13:22:37 +00:00
parent 6453876e12
commit be9abe3fd0
5 changed files with 48 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/generic/progdlgg.cpp
View File

@@ -57,6 +57,7 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
m_state = hasAbortButton ? Continue : Uncancelable;
m_disableParentOnly = (style & wxPD_APP_MODAL) == 0;
m_parent = parent;
m_maximum = maximum;
int height = 70; // FIXME arbitrary numbers
if ( hasAbortButton )
@@ -87,21 +88,23 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
m_gauge->SetValue(0);
}
else
m_gauge = NULL;
m_gauge = (wxGauge *)NULL;
if ( hasAbortButton )
{
wxControl *ctrl = new wxButton(this, -1, _("Cancel"));
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(ctrl, 2*LAYOUT_Y_MARGIN);
c->top.Below(m_btnAbort, 2*LAYOUT_Y_MARGIN);
c->width.AsIs();
c->height.AsIs();
ctrl->SetConstraints(c);
m_btnAbort->SetConstraints(c);
}
else
m_btnAbort = (wxButton *)NULL;
SetAutoLayout(TRUE);
Show(TRUE);
@@ -120,13 +123,36 @@ bool
wxProgressDialog::Update(int value, const wxString& newmsg)
{
wxASSERT_MSG( value == -1 || m_gauge, "can't update non existent dialog" );
wxASSERT_MSG( value < m_maximum, "invalid progress value" );
if( m_gauge )
m_gauge->SetValue(value);
if( !newmsg.IsNull() )
m_gauge->SetValue(value + 1);
if( !newmsg.IsEmpty() )
m_msg->SetLabel(newmsg);
wxYield();
if ( (value == m_maximum - 1) && !(GetWindowStyleFlag() & 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."));
}
m_state = Finished;
while ( m_state != Canceled ) // set from OnClose()
wxYield();
// so that we return TRUE below
m_state = Finished;
}
return m_state != Canceled;
}