From d0cf484622a7c56c13a3833b8347e27bd6ab21fc Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sun, 16 Jan 2000 22:55:13 +0000 Subject: [PATCH] wxProgressDialog now accepts wxGA_SMOOTH style git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5465 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/defs.h | 3 ++- src/generic/progdlgg.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/wx/defs.h b/include/wx/defs.h index d1717e5a40..c03471ff7a 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -1138,7 +1138,8 @@ enum wxStretch #define wxPD_AUTO_HIDE 0x0004 #define wxPD_ELAPSED_TIME 0x0008 #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 diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp index ca8ae78b8a..473e9db487 100644 --- a/src/generic/progdlgg.cpp +++ b/src/generic/progdlgg.cpp @@ -124,7 +124,7 @@ wxProgressDialog::wxProgressDialog(wxString const &title, { 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); -- 2.47.2