X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0e871ad03970d65f7bb29d6eea13263bdfdf2299..ef7823016897c0c04c88019e14f48837764e50be:/include/wx/chkconf.h

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 613c97068a..341dc163b5 100644
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -15,7 +15,7 @@
    Compiler-specific checking.
  */
 
-#if defined(__PALMOS__)
+#if defined(__WXPALMOS__)
 #  include "wx/palmos/chkconf.h"
 #elif defined(__WXMSW__)
 #  include "wx/msw/chkconf.h"
@@ -1460,9 +1460,21 @@
 #   endif
 #endif /* wxUSE_FILEDLG */
 
+#if !wxUSE_GAUGE || !wxUSE_BUTTON
+#   if wxUSE_PROGRESSDLG && !defined(__WXPALMOS__)
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "Generic progress dialog requires wxUSE_GAUGE and wxUSE_BUTTON"
+#       else
+#           undef wxUSE_GAUGE
+#           undef wxUSE_BUTTON
+#           define wxUSE_GAUGE 1
+#           define wxUSE_BUTTON 1
+#       endif
+#   endif
+#endif /* !wxUSE_GAUGE */
+
 #if !wxUSE_BUTTON
-#   if wxUSE_PROGRESSDLG || \
-       wxUSE_FONTDLG || \
+#   if wxUSE_FONTDLG || \
        wxUSE_FILEDLG || \
        wxUSE_CHOICEDLG || \
        wxUSE_NUMBERDLG || \
@@ -1477,7 +1489,7 @@
 #           define wxUSE_BUTTON 1
 #       endif
 #   endif
-#endif /* wxUSE_PROGRESSDLG */
+#endif /* !wxUSE_BUTTON */
 
 #if !wxUSE_TOOLBAR
 #   if wxUSE_TOOLBAR_NATIVE