merged 2.4 branch into the trunk

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-04 14:11:26 +00:00
parent 59a944cb63
commit 2b5f62a0b2
1057 changed files with 37805 additions and 24034 deletions
--- a/include/wx/html/helpfrm.h
+++ b/include/wx/html/helpfrm.h
@@ -33,7 +33,9 @@
 #include "wx/stattext.h"
 #include "wx/html/htmlwin.h"
 #include "wx/html/htmprint.h"
+
 class WXDLLEXPORT wxButton;
+class WXDLLEXPORT wxTextCtrl;


 // style flags for the Help Frame