diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index ddcf097547..438a6a373e 100644
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -1221,6 +1221,15 @@
 #           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
@@ -1348,6 +1357,15 @@
 #        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"
diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp
index 8be47e51c2..0772cf2839 100644
--- a/src/common/fontmap.cpp
+++ b/src/common/fontmap.cpp
@@ -175,6 +175,7 @@ wxFontMapper::CharsetToEncoding(const wxString& charset, bool interactive)
         // chosen to suppress this the last time)
         encoding = wxFONTENCODING_SYSTEM;
     }
+#if wxUSE_CHOICEDLG
     else if ( (encoding == wxFONTENCODING_SYSTEM) && interactive )
     {
         // prepare the dialog data
@@ -233,6 +234,9 @@ wxFontMapper::CharsetToEncoding(const wxString& charset, bool interactive)
         }
 #endif // wxUSE_CONFIG
     }
+#else
+    wxUnusedVar(interactive);
+#endif // wxUSE_CHOICEDLG
 
     return (wxFontEncoding)encoding;
 }