wxProgressDialog now accepts wxGA_SMOOTH style

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5465 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/defs.h b/include/wx/defs.h
index d1717e5a402db2c8ffd9c9789cefba1eb4dc6b50..c03471ff7a13a5996201afd34afeae8ebf96e792 100644 (file)
--- 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_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
 
 /*
  * wxHtmlWindow flags

diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp
index ca8ae78b8a33f6b1524497cacd9372f658724147..473e9db4872608d87215f0e1dffdf9898d80a63e 100644 (file)
--- 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,
     {
         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);