removed obsolete wxUSE_CTL3D

[wxWidgets.git] / include / wx / chkconf.h

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index bf26c9d78077303d247aad14e08e675b95474822..341dc163b509cbf1cffdcf02bbeee65faa421dd0 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -1460,20 +1460,21 @@
 #   endif
 #endif /* wxUSE_FILEDLG */
 
-#if !wxUSE_GAUGE
-#   if wxUSE_PROGRESSDLG
+#if !wxUSE_GAUGE || !wxUSE_BUTTON
+#   if wxUSE_PROGRESSDLG && !defined(__WXPALMOS__)
 #       ifdef wxABORT_ON_CONFIG_ERROR
-#           error "Progress dialog require wxUSE_GAUGE"
+#           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 || \