fixed warnings after GetFont prototype change

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

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index ddcf097547e3d1a94d6599dfa377dcb373ac4e5b..438a6a373ec106872ddf94e4da1a0fb5f9e4e38b 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -1221,6 +1221,15 @@
 #           define wxUSE_BMPBUTTON 1
 #       endif
 #   endif
 #           define wxUSE_BMPBUTTON 1
 #       endif
 #   endif

+
+#   if !wxUSE_CHOICEDLG
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxUSE_HELP requires wxUSE_CHOICEDLG"
+#       else
+#           undef wxUSE_CHOICEDLG
+#           define wxUSE_CHOICEDLG 1
+#       endif
+#   endif

 #endif /* wxUSE_HELP */
 
 #if wxUSE_WXHTML_HELP
 #endif /* wxUSE_HELP */
 
 #if wxUSE_WXHTML_HELP


@@ -1348,6 +1357,15 @@
 #        endif
 #   endif
 
 #        endif
 #   endif
 

+#   if !wxUSE_CHOICEDLG
+#        ifdef wxABORT_ON_CONFIG_ERROR
+#            error "DocView requires wxUSE_CHOICEDLG"
+#        else
+#            undef wxUSE_CHOICEDLG
+#            define wxUSE_CHOICEDLG 1
+#        endif
+#   endif
+

 #   if !wxUSE_STREAMS && !wxUSE_STD_IOSTREAM
 #        ifdef wxABORT_ON_CONFIG_ERROR
 #            error "DocView requires wxUSE_STREAMS or wxUSE_STD_IOSTREAM"
 #   if !wxUSE_STREAMS && !wxUSE_STD_IOSTREAM
 #        ifdef wxABORT_ON_CONFIG_ERROR
 #            error "DocView requires wxUSE_STREAMS or wxUSE_STD_IOSTREAM"