applied BCC fixes for wxXML

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

diff --git a/contrib/src/xml/makefile.b32 b/contrib/src/xml/makefile.b32
index 1f67e6aad51729cbeeeaf0b78c5080b5387879ed..0078a6370de95ef3a3cf1d0de24208ce71fdc949 100644 (file)
--- 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
 # <libxml/xxxx.h>.  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 99e1ed3d352c11888992561373a813a42b934398..1739ab320c384cc25e9fbe112c412bbe2e957e8b 100644 (file)
--- 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 095d0c395d448c472af545e4d42af65fee28facd..1696ea425a27bf565114dbfc2709e357b2e40abf 100644 (file)
--- 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 0ed177189aa49c06abb2b996399cf515aec98b38..c7fc2f474657af20616a7d26595e389e1b96f754 100644 (file)
--- 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)