making wxHTML 8.3 compliant

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-02 18:19:46 +00:00
parent 47f631042b
commit 69941f0586
41 changed files with 331 additions and 321 deletions
--- a/src/html/helpctrl.cpp
+++ b/src/html/helpctrl.cpp
@@ -4,14 +4,13 @@
 // Notes:       Based on htmlhelp.cpp, implementing a monolithic
 //              HTML Help controller class,  by Vaclav Slavik
 // Author:      Harm van der Heijden and Vaclav Slavik
-// Created:
-// RCS-ID:
+// RCS-ID:      $Id$
 // Copyright:   (c) Harm van der Heijden and Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifdef __GNUG__
-#pragma implementation "helpctrl.h"
+#pragma implementation
 #endif

 // For compilers that support precompilation, includes "wx.h".
@@ -61,7 +60,7 @@ bool wxHtmlHelpController::AddBook(const wxString& book, bool show_wait_msg)
 {
    wxBusyCursor cur;
 #if wxUSE_BUSYINFO
-    wxBusyInfo* busy;
+    wxBusyInfo* busy = NULL;
    wxString info;
    if (show_wait_msg) {
 	info.Printf(_("Adding book %s"), book.c_str());
--- a/src/html/helpdata.cpp
+++ b/src/html/helpdata.cpp
@@ -4,14 +4,13 @@
 // Notes:       Based on htmlhelp.cpp, implementing a monolithic
 //              HTML Help controller class,  by Vaclav Slavik
 // Author:      Harm van der Heijden and Vaclav Slavik
-// Created:
-// RCS-ID:
+// RCS-ID:      $Id$
 // Copyright:   (c) Harm van der Heijden and Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifdef __GNUG__
-#pragma implementation "helpdata.h"
+#pragma implementation
 #endif

 // For compilers that support precompilation, includes "wx.h".
@@ -33,7 +32,7 @@
 #include "wx/tokenzr.h"
 #include "wx/wfstream.h"
 #include "wx/busyinfo.h"
-#include "wx/html/htmlparser.h"
+#include "wx/html/htmlpars.h"
 #include "wx/html/htmldefs.h"

 #include "wx/arrimpl.cpp"
--- a/src/html/helpfrm.cpp
+++ b/src/html/helpfrm.cpp
@@ -4,14 +4,13 @@
 // Notes:       Based on htmlhelp.cpp, implementing a monolithic 
 //              HTML Help controller class,  by Vaclav Slavik
 // Author:      Harm van der Heijden and Vaclav Slavik
-// Created:
-// RCS-ID:
+// RCS-ID:      $Id$
 // Copyright:   (c) Harm van der Heijden and Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifdef __GNUG__
-#pragma implementation "helpfrm.h"
+#pragma implementation
 #endif

 // For compilers that support precompilation, includes "wx.h".
--- a/src/html/htmlcell.cpp
+++ b/src/html/htmlcell.cpp
@@ -2,12 +2,13 @@
 // Name:        htmlcell.cpp
 // Purpose:     wxHtmlCell - basic element of HTML output
 // Author:      Vaclav Slavik
+// RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////

 #ifdef __GNUG__
-#pragma implementation "htmlcell.h"
+#pragma implementation
 #endif

 #include "wx/wxprec.h"
--- a/src/html/htmlfilter.cpp
+++ b/src/html/htmlfilter.cpp
@@ -1,14 +1,15 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        filter.cpp
+// Name:        htmlfilt.cpp
 // Purpose:     wxHtmlFilter - input filter for translating into HTML format
 // Author:      Vaclav Slavik
+// RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////


 #ifdef __GNUG__
-#pragma implementation "htmlfilter.h"
+#pragma implementation
 #endif

 #include "wx/wxprec.h"
@@ -23,7 +24,7 @@
 #include "wx/wx.h"
 #endif

-#include "wx/html/htmlfilter.h"
+#include "wx/html/htmlfilt.h"
 #include "wx/html/htmlwin.h"


--- a/src/html/htmlparser.cpp
+++ b/src/html/htmlparser.cpp
@@ -1,7 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        htmlparser.cpp
+// Name:        htmlpars.cpp
 // Purpose:     wxHtmlParser class (generic parser)
 // Author:      Vaclav Slavik
+// RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
@@ -24,11 +25,11 @@
 #include <wx/wx.h>
 #endif

-#include <wx/tokenzr.h>
-#include <wx/wfstream.h>
-#include <wx/url.h>
-#include <wx/html/htmldefs.h>
-#include <wx/html/htmlparser.h>
+#include "wx/tokenzr.h"
+#include "wx/wfstream.h"
+#include "wx/url.h"
+#include "wx/html/htmldefs.h"
+#include "wx/html/htmlpars.h"



--- a/src/html/htmltag.cpp
+++ b/src/html/htmltag.cpp
@@ -2,6 +2,7 @@
 // Name:        htmltag.cpp
 // Purpose:     wxHtmlTag class (represents single tag)
 // Author:      Vaclav Slavik
+// RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
@@ -24,7 +25,7 @@
 #include <wx/wx.h>
 #endif

-#include <wx/html/htmltag.h>
+#include "wx/html/htmltag.h"
 #include <stdio.h> // for vsscanf
 #include <stdarg.h>

--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -2,6 +2,7 @@
 // Name:        htmlwin.cpp
 // Purpose:     wxHtmlWindow class for parsing & displaying HTML (implementation)
 // Author:      Vaclav Slavik
+// RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
@@ -24,9 +25,9 @@
 #include <wx/wx.h>
 #endif

-#include <wx/html/htmlwin.h>
+#include "wx/html/htmlwin.h"

-#include <wx/html/forcelink.h>
+#include "wx/html/forcelnk.h"



--- a/src/html/mod_fonts.cpp
+++ b/src/html/mod_fonts.cpp
@@ -2,6 +2,7 @@
 // Name:        mod_fonts.cpp
 // Purpose:     wxHtml module for fonts & colors of fonts
 // Author:      Vaclav Slavik
+// RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
@@ -23,8 +24,8 @@
 #include <wx/wx.h>
 #endif

-#include <wx/html/forcelink.h>
-#include <wx/html/mod_templ.h>
+#include "wx/html/forcelnk.h"
+#include "wx/html/m_templ.h"

 FORCE_LINK_ME(mod_fonts)

--- a/src/html/mod_hline.cpp
+++ b/src/html/mod_hline.cpp
@@ -2,6 +2,7 @@
 // Name:        mod_hline.cpp
 // Purpose:     wxHtml module for horizontal line (HR tag)
 // Author:      Vaclav Slavik
+// RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
@@ -25,10 +26,10 @@



-#include <wx/html/forcelink.h>
-#include <wx/html/mod_templ.h>
+#include "wx/html/forcelnk.h"
+#include "wx/html/m_templ.h"

-#include <wx/html/htmlcell.h>
+#include "wx/html/htmlcell.h"

 FORCE_LINK_ME(mod_hline)

--- a/src/html/mod_image.cpp
+++ b/src/html/mod_image.cpp
@@ -2,6 +2,7 @@
 // Name:        mod_image.cpp
 // Purpose:     wxHtml module for displaying images
 // Author:      Vaclav Slavik
+// RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik, Joel Lucsy
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
@@ -23,8 +24,8 @@
 #include "wx/wx.h"
 #endif

-#include "wx/html/forcelink.h"
-#include "wx/html/mod_templ.h"
+#include "wx/html/forcelnk.h"
+#include "wx/html/m_templ.h"


 #include "wx/image.h"
--- a/src/html/mod_layout.cpp
+++ b/src/html/mod_layout.cpp
@@ -2,6 +2,7 @@
 // Name:        mod_layout.cpp
 // Purpose:     wxHtml module for basic paragraphs/layout handling
 // Author:      Vaclav Slavik
+// RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
@@ -21,10 +22,10 @@
 #endif


-#include <wx/html/forcelink.h>
-#include <wx/html/mod_templ.h>
+#include "wx/html/forcelnk.h"
+#include "wx/html/m_templ.h"

-#include <wx/html/htmlwin.h>
+#include "wx/html/htmlwin.h"

 FORCE_LINK_ME(mod_layout)

--- a/src/html/mod_links.cpp
+++ b/src/html/mod_links.cpp
@@ -2,6 +2,7 @@
 // Name:        mod_links.cpp
 // Purpose:     wxHtml module for links & anchors
 // Author:      Vaclav Slavik
+// RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
@@ -23,8 +24,8 @@
 #endif


-#include <wx/html/forcelink.h>
-#include <wx/html/mod_templ.h>
+#include "wx/html/forcelnk.h"
+#include "wx/html/m_templ.h"


 FORCE_LINK_ME(mod_links)
--- a/src/html/mod_list.cpp
+++ b/src/html/mod_list.cpp
@@ -2,6 +2,7 @@
 // Name:        mod_list.cpp
 // Purpose:     wxHtml module for lists
 // Author:      Vaclav Slavik
+// RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
@@ -24,10 +25,10 @@
 #endif


-#include <wx/html/forcelink.h>
-#include <wx/html/mod_templ.h>
+#include "wx/html/forcelnk.h"
+#include "wx/html/m_templ.h"

-#include <wx/html/htmlcell.h>
+#include "wx/html/htmlcell.h"

 FORCE_LINK_ME(mod_list)

--- a/src/html/mod_pre.cpp
+++ b/src/html/mod_pre.cpp
@@ -2,6 +2,7 @@
 // Name:        mod_pre.cpp
 // Purpose:     wxHtml module for <PRE> ... </PRE> tag (code citation)
 // Author:      Vaclav Slavik
+// RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
@@ -22,10 +23,10 @@
 #endif


-#include <wx/html/forcelink.h>
-#include <wx/html/mod_templ.h>
+#include "wx/html/forcelnk.h"
+#include "wx/html/m_templ.h"

-#include <wx/html/htmlcell.h>
+#include "wx/html/htmlcell.h"
 #include <wx/tokenzr.h>

 FORCE_LINK_ME(mod_pre)
--- a/src/html/mod_tables.cpp
+++ b/src/html/mod_tables.cpp
@@ -2,6 +2,7 @@
 // Name:        mod_tables.cpp
 // Purpose:     wxHtml module for tables
 // Author:      Vaclav Slavik
+// RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
@@ -29,10 +30,10 @@ REMARKS:
 */


-#include <wx/html/forcelink.h>
-#include <wx/html/mod_templ.h>
+#include "wx/html/forcelnk.h"
+#include "wx/html/m_templ.h"

-#include <wx/html/htmlcell.h>
+#include "wx/html/htmlcell.h"

 FORCE_LINK_ME(mod_tables)

--- a/src/html/search.cpp
+++ b/src/html/search.cpp
@@ -2,6 +2,7 @@
 // Name:        search.cpp
 // Purpose:     search engine
 // Author:      Vaclav Slavik
+// RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
--- a/src/html/htmlwinparser.cpp
+++ b/src/html/htmlwinparser.cpp
@@ -1,7 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        htmlwinparser.cpp
+// Name:        winpars.cpp
 // Purpose:     wxHtmlParser class (generic parser)
 // Author:      Vaclav Slavik
+// RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
@@ -24,9 +25,9 @@
 #include <wx/wx.h>
 #endif

-#include <wx/html/htmldefs.h>
-#include <wx/html/htmlwinparser.h>
-#include <wx/html/htmlwin.h>
+#include "wx/html/htmldefs.h"
+#include "wx/html/winpars.h"
+#include "wx/html/htmlwin.h"


 //-----------------------------------------------------------------------------
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -1,6 +1,6 @@


-# This file was automatically generated by tmake at 00:54, 1999/10/02
+# This file was automatically generated by tmake at 20:06, 1999/10/02
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!

 #
--- a/src/msw/makefile.bcc
+++ b/src/msw/makefile.bcc
@@ -1,6 +1,6 @@


-# This file was automatically generated by tmake at 00:58, 1999/10/02
+# This file was automatically generated by tmake at 20:06, 1999/10/02
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T!

 #
--- a/src/msw/makefile.dos
+++ b/src/msw/makefile.dos
@@ -1,6 +1,6 @@


-# This file was automatically generated by tmake at 20:00, 1999/10/01
+# This file was automatically generated by tmake at 20:06, 1999/10/02
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T!

 #
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -1,5 +1,5 @@

-# This file was automatically generated by tmake at 20:00, 1999/10/01
+# This file was automatically generated by tmake at 20:06, 1999/10/02
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!

 #
@@ -152,20 +152,20 @@ HTMLOBJS = \
 		$(HTMLDIR)/helpdata.$(OBJSUFF) \
 		$(HTMLDIR)/helpfrm.$(OBJSUFF) \
 		$(HTMLDIR)/htmlcell.$(OBJSUFF) \
-		$(HTMLDIR)/htmlfilter.$(OBJSUFF) \
-		$(HTMLDIR)/htmlparser.$(OBJSUFF) \
+		$(HTMLDIR)/htmlfilt.$(OBJSUFF) \
+		$(HTMLDIR)/htmlpars.$(OBJSUFF) \
 		$(HTMLDIR)/htmltag.$(OBJSUFF) \
 		$(HTMLDIR)/htmlwin.$(OBJSUFF) \
-		$(HTMLDIR)/htmlwinparser.$(OBJSUFF) \
-		$(HTMLDIR)/mod_fonts.$(OBJSUFF) \
-		$(HTMLDIR)/mod_hline.$(OBJSUFF) \
-		$(HTMLDIR)/mod_image.$(OBJSUFF) \
-		$(HTMLDIR)/mod_layout.$(OBJSUFF) \
-		$(HTMLDIR)/mod_links.$(OBJSUFF) \
-		$(HTMLDIR)/mod_list.$(OBJSUFF) \
-		$(HTMLDIR)/mod_pre.$(OBJSUFF) \
-		$(HTMLDIR)/mod_tables.$(OBJSUFF) \
-		$(HTMLDIR)/search.$(OBJSUFF)
+		$(HTMLDIR)/m_fonts.$(OBJSUFF) \
+		$(HTMLDIR)/m_hline.$(OBJSUFF) \
+		$(HTMLDIR)/m_image.$(OBJSUFF) \
+		$(HTMLDIR)/m_layout.$(OBJSUFF) \
+		$(HTMLDIR)/m_links.$(OBJSUFF) \
+		$(HTMLDIR)/m_list.$(OBJSUFF) \
+		$(HTMLDIR)/m_pre.$(OBJSUFF) \
+		$(HTMLDIR)/m_tables.$(OBJSUFF) \
+		$(HTMLDIR)/search.$(OBJSUFF) \
+		$(HTMLDIR)/winpars.$(OBJSUFF)

 MSWOBJS     = \
 		$(MSWDIR)/accel.$(OBJSUFF) \
--- a/src/msw/makefile.sc
+++ b/src/msw/makefile.sc
@@ -1,6 +1,6 @@


-# This file was automatically generated by tmake at 20:00, 1999/10/01
+# This file was automatically generated by tmake at 20:06, 1999/10/02
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T!

 # Symantec C++ makefile for the msw objects
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 20:01, 1999/10/01
+# This file was automatically generated by tmake at 20:06, 1999/10/02
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!

 # File:     makefile.vc
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -1,6 +1,6 @@


-# This file was automatically generated by tmake at 20:01, 1999/10/01
+# This file was automatically generated by tmake at 20:06, 1999/10/02
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!

 #!/binb/wmake.exe