[lmi-commits] [lmi] master f750012 2/4: Fall back on generic progress dialog to work around regressions

[Greg Chicares]

branch: master
commit f75001244ecdc74b9f3b58dfc8ead572725111be
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Fall back on generic progress dialog to work around regressions
    
    Class wxProgressDialog has always been specified here, but gcc-4.9.x
    caused wxGenericProgressDialog to be used instead. Upgrading to
    gcc-6.3.0 caused the native control to be used, resulting in lmi
    regressions--see:
      https://trac.wxwidgets.org/ticket/13933
      https://trac.wxwidgets.org/ticket/13185
    Reverted the regression by using wxGenericProgressDialog explicitly.
    This is only a temporary expedient. Once the problems have been fixed,
    the intention is to upgrade wx and revert this commit.
---
 progress_meter_wx.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/progress_meter_wx.cpp b/progress_meter_wx.cpp
index 53675ab..1e96244 100644
--- a/progress_meter_wx.cpp
+++ b/progress_meter_wx.cpp
@@ -73,7 +73,9 @@ class concrete_progress_meter
     bool show_progress_message() override;
     void culminate_ui() override;
 
-    wxProgressDialog progress_dialog_;
+// Temporarily overridden while wx issues are being addressed:
+//    wxProgressDialog progress_dialog_;
+    wxGenericProgressDialog progress_dialog_;
 };
 
 // TODO ?? CALCULATION_SUMMARY Resolve this issue.