wxProgressDialog now accepts wxGA_SMOOTH style
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5465 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1138,7 +1138,8 @@ enum wxStretch
|
|||||||
#define wxPD_AUTO_HIDE 0x0004
|
#define wxPD_AUTO_HIDE 0x0004
|
||||||
#define wxPD_ELAPSED_TIME 0x0008
|
#define wxPD_ELAPSED_TIME 0x0008
|
||||||
#define wxPD_ESTIMATED_TIME 0x0010
|
#define wxPD_ESTIMATED_TIME 0x0010
|
||||||
#define wxPD_REMAINING_TIME 0x0020
|
// wxGA_SMOOTH = 0x0020 may also be used with wxProgressDialog
|
||||||
|
#define wxPD_REMAINING_TIME 0x0040
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* wxHtmlWindow flags
|
* wxHtmlWindow flags
|
||||||
|
@@ -124,7 +124,7 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
|
|||||||
{
|
{
|
||||||
m_gauge = new wxGauge(this, -1, maximum,
|
m_gauge = new wxGauge(this, -1, maximum,
|
||||||
wxDefaultPosition, wxDefaultSize,
|
wxDefaultPosition, wxDefaultSize,
|
||||||
wxGA_HORIZONTAL | wxRAISED_BORDER);
|
wxGA_HORIZONTAL | wxRAISED_BORDER | (style & wxGA_SMOOTH));
|
||||||
c = new wxLayoutConstraints;
|
c = new wxLayoutConstraints;
|
||||||
c->left.SameAs(this, wxLeft, 2*LAYOUT_X_MARGIN);
|
c->left.SameAs(this, wxLeft, 2*LAYOUT_X_MARGIN);
|
||||||
c->top.Below(m_msg, 2*LAYOUT_Y_MARGIN);
|
c->top.Below(m_msg, 2*LAYOUT_Y_MARGIN);
|
||||||
|
Reference in New Issue
Block a user