From 6c05d4f3d5e7cd966be24c7d0ab70e5aae51b614 Mon Sep 17 00:00:00 2001 From: xj qian <qianxj15@sina.com> Date: 星期二, 09 七月 2024 16:10:50 +0800 Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj --- jrj/xframe/kobject/kxml.hpp | 39 ++++++++++++++++++++++++++++++--------- 1 files changed, 30 insertions(+), 9 deletions(-) diff --git a/jrj/xframe/kobject/kxml.hpp b/jrj/xframe/kobject/kxml.hpp index 8e1dd1f..dcf125c 100644 --- a/jrj/xframe/kobject/kxml.hpp +++ b/jrj/xframe/kobject/kxml.hpp @@ -133,13 +133,41 @@ KXMLDOMNode(const KXMLDOMNode& rhs); const KXMLDOMNode& operator =(const KXMLDOMNode& rhs); public: + unsigned long AddRef(); + unsigned long Release(); + public: + LPARAM ptr() + { + this->AddRef(); + return (LPARAM)this->getImpl(); + } + KXMLDOMNode(LPARAM p) :KXMLDOMNode((void*)p) {} + public: operator bool() { return impl ? true : false; } public: void* getImpl(); }; + + class KXMLDOMElement : public KXMLDOMNode + { + public: + KXMLDOMElement(KXMLDOMNode v); + KXMLDOMElement(void* impl) :KXMLDOMNode(impl) {} + KXMLDOMElement() :KXMLDOMNode() {} + public: + KXMLDOMElement(LPARAM p) :KXMLDOMNode((void*)p) { + AddRef(); + } + }; + class KXMLDOMDocument : public KXMLDOMNode { + public: + bool operator !() + { + return !impl || !documentElement(); + } public: const wchar_t* text(); const wchar_t* url(); @@ -193,13 +221,6 @@ KXMLDOMDocument(const KXMLDOMDocument& rhs); }; - class KXMLDOMElement : public KXMLDOMNode - { - public: - KXMLDOMElement( KXMLDOMNode v); - KXMLDOMElement(void* impl) :KXMLDOMNode(impl) {} - KXMLDOMElement() :KXMLDOMNode() {} - }; class KXMLDOMAttribute : public KXMLDOMNode { public: @@ -269,8 +290,8 @@ KXMLDOMElement* m_pElement; public: KXMLDOMElementPtr(LPARAM ele) :m_pElement((KXMLDOMElement*)ele) {} - KXMLDOMElementPtr(KXMLDOMElement* pEle) :m_pElement((KXMLDOMElement*)pEle) {} - //KXMLDOMElementPtr(KXMLDOMElement ele) :m_pElement(new KXMLDOMElement(ele)) {} + KXMLDOMElementPtr(KXMLDOMElement* pEle) :m_pElement(pEle) {} + KXMLDOMElementPtr(KXMLDOMElement ele) :m_pElement(new KXMLDOMElement(ele)) {} public: KXMLDOMElement* value() { return m_pElement; } public: -- Gitblit v1.9.3