Applied patch to "correct" hashmap's freeing

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

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 613c97068a6370f8ceddcf222be70d6a25a0e5f3..3d05c7c85cc3975b23fb6809d76b44b2eca3cb7f 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -1460,6 +1460,17 @@
 #   endif
 #endif /* wxUSE_FILEDLG */
 
 #   endif
 #endif /* wxUSE_FILEDLG */
 

+#if !wxUSE_GAUGE
+#   if wxUSE_PROGRESSDLG
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "Progress dialog require wxUSE_GAUGE"
+#       else
+#           undef wxUSE_GAUGE
+#           define wxUSE_GAUGE 1
+#       endif
+#   endif
+#endif /* !wxUSE_GAUGE */
+

 #if !wxUSE_BUTTON
 #   if wxUSE_PROGRESSDLG || \
        wxUSE_FONTDLG || \
 #if !wxUSE_BUTTON
 #   if wxUSE_PROGRESSDLG || \
        wxUSE_FONTDLG || \


@@ -1477,7 +1488,7 @@
 #           define wxUSE_BUTTON 1
 #       endif
 #   endif
 #           define wxUSE_BUTTON 1
 #       endif
 #   endif

-#endif /* wxUSE_PROGRESSDLG */
+#endif /* !wxUSE_BUTTON */

 
 #if !wxUSE_TOOLBAR
 #   if wxUSE_TOOLBAR_NATIVE
 
 #if !wxUSE_TOOLBAR
 #   if wxUSE_TOOLBAR_NATIVE