X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/abceee76ea4d642ccfd3cf91cc139a3fe2b471b7..77611ad4da9df336a0805508276a81b8f4437107:/src/generic/progdlgg.cpp

diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp
index 7a3cdb7a3f..b8a6a17e00 100644
--- a/src/generic/progdlgg.cpp
+++ b/src/generic/progdlgg.cpp
@@ -86,6 +86,8 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
                                    int style)
                 : wxDialog(parent, -1, title)
 {
+    m_windowStyle |= style;
+
     bool hasAbortButton = (style & wxPD_CAN_ABORT) != 0;
     m_state = hasAbortButton ? Continue : Uncancelable;
     m_maximum = maximum;
@@ -127,7 +129,11 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
     {
         m_gauge = new wxGauge(this, -1, maximum,
                 wxDefaultPosition, wxDefaultSize,
-                wxGA_HORIZONTAL | wxRAISED_BORDER | (style & wxGA_SMOOTH));
+                wxGA_HORIZONTAL | wxRAISED_BORDER);
+// Sorry, but wxGA_SMOOTH happens to also mean wxDIALOG_MODAL and will
+// cause the dialog to be modal. Have an extra style argument to wxProgressDialog,
+// perhaps.
+//                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);