From ecdce304e45bb8d8ba5596ba63f7c4df9b01ad96 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sat, 21 Apr 2001 14:53:54 +0000 Subject: [PATCH] applied BCC fixes for wxXML git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9822 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/src/xml/makefile.b32 | 4 ++-- contrib/src/xml/makefile.g95 | 2 +- contrib/src/xml/xh_listc.cpp | 1 + contrib/src/xml/xml.cpp | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/contrib/src/xml/makefile.b32 b/contrib/src/xml/makefile.b32 index 1f67e6aad5..0078a6370d 100644 --- a/contrib/src/xml/makefile.b32 +++ b/contrib/src/xml/makefile.b32 @@ -14,8 +14,8 @@ WXDIR = $(WXWIN) # this -I line, as the #includes use # . If your libxml is installed # in "d:\libxml\libxml2-2.1.1\libxml" you would use: -# wxLIBXMLDIR=/Id:\libxml\libxml2-2.1.1 -wxLIBXMLDIR= +# wxLIBXMLDIR=/Id:\libxml\libxml2-2.1.1\include +wxLIBXMLDIR=/Ic:\progra~1\libxml\libxml2-2.3.3\include !if "$(wxLIBXMLDIR)" == "" !message diff --git a/contrib/src/xml/makefile.g95 b/contrib/src/xml/makefile.g95 index 99e1ed3d35..1739ab320c 100644 --- a/contrib/src/xml/makefile.g95 +++ b/contrib/src/xml/makefile.g95 @@ -9,7 +9,7 @@ WXDIR = ../../.. -EXTRACPPFLAGS=/Id:/libxml/libxml2-2.1.1 +EXTRACPPFLAGS=-Ic:/progra~1/libxml/libxml2-2.3.3/include LIBTARGET=$(WXDIR)/lib/libwxxml.a OBJECTS=xml.o xmlbin.o xmlbinz.o xmlpars.o xmlres.o xmlrsall.o \ diff --git a/contrib/src/xml/xh_listc.cpp b/contrib/src/xml/xh_listc.cpp index 095d0c395d..1696ea425a 100644 --- a/contrib/src/xml/xh_listc.cpp +++ b/contrib/src/xml/xh_listc.cpp @@ -19,6 +19,7 @@ #pragma hdrstop #endif +#include "wx/textctrl.h" #include "wx/xml/xh_listc.h" #include "wx/listctrl.h" diff --git a/contrib/src/xml/xml.cpp b/contrib/src/xml/xml.cpp index 0ed177189a..c7fc2f4746 100644 --- a/contrib/src/xml/xml.cpp +++ b/contrib/src/xml/xml.cpp @@ -275,6 +275,8 @@ bool wxXmlNode::DeleteProperty(const wxString& name) +wxList *wxXmlDocument::sm_Handlers = NULL; + wxXmlDocument::wxXmlDocument(const wxString& filename, wxXmlIOType io_type) @@ -383,8 +385,6 @@ bool wxXmlDocument::Save(wxOutputStream& stream, wxXmlIOType io_type) const -wxList *wxXmlDocument::sm_Handlers = NULL; - void wxXmlDocument::AddHandler(wxXmlIOHandler *handler) { if (sm_Handlers == NULL) -- 2.47.2