applied BCC fixes for wxXML
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9822 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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
|
||||
|
@@ -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 \
|
||||
|
@@ -19,6 +19,7 @@
|
||||
#pragma hdrstop
|
||||
#endif
|
||||
|
||||
#include "wx/textctrl.h"
|
||||
#include "wx/xml/xh_listc.h"
|
||||
#include "wx/listctrl.h"
|
||||
|
||||
|
@@ -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)
|
||||
|
Reference in New Issue
Block a user