tons of fixes for wxGTK/Univ - seems to work, more or less, now

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10805 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/html/helpctrl.cpp

@@ -20,7 +20,7 @@
 #pragma hdrstop
 #endif
 
-#if wxUSE_HTML && wxUSE_STREAMS
+#if wxUSE_WXHTML_HELP
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
@@ -248,4 +248,5 @@ bool wxHtmlHelpController::Quit()
     return TRUE;
 }
 
-#endif
+#endif // wxUSE_WXHTML_HELP
+