diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index e1cdd5c14f..55f8e236a0 100644
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -1215,6 +1215,9 @@
 // progress dialog class for lengthy operations
 #define wxUSE_PROGRESSDLG 1
 
+// native MSW progress dialog class, flickering not yet debugged
+#define wxUSE_NATIVE_PROGRESSDLG 0
+
 // support for startup tips (wxShowTip &c)
 #define wxUSE_STARTUP_TIPS 1
 
diff --git a/include/wx/progdlg.h b/include/wx/progdlg.h
index e17d37ea3e..00e20b3639 100644
--- a/include/wx/progdlg.h
+++ b/include/wx/progdlg.h
@@ -30,7 +30,7 @@
 
 #include "wx/generic/progdlgg.h"
 
-#if defined(__WXMSW__) && wxUSE_THREADS && !defined(__WXUNIVERSAL__)
+#if defined(__WXMSW__) && wxUSE_THREADS && !defined(__WXUNIVERSAL__) && wxUSE_NATIVE_PROGRESSDLG
     #include "wx/msw/progdlg.h"
 #else
     class WXDLLIMPEXP_CORE wxProgressDialog
diff --git a/src/msw/progdlg.cpp b/src/msw/progdlg.cpp
index 3f9adea6e8..f44c17ba68 100644
--- a/src/msw/progdlg.cpp
+++ b/src/msw/progdlg.cpp
@@ -22,7 +22,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_PROGRESSDLG && wxUSE_THREADS
+#if wxUSE_PROGRESSDLG && wxUSE_THREADS && wxUSE_NATIVE_PROGRESSDLG
 
 #include "wx/progdlg.h"