[Wired-commits] SF.net SVN: wired: [883] trunk/wired/src/xml/WiredXml.cpp

[<hdo...@us...>]

Revision: 883
Author:   hdoomsday
Date:     2006-07-04 04:46:47 -0700 (Tue, 04 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/wired/?rev=883&view=rev

Log Message:
-----------
fix some incompatibility for wx without unicode
file WiredXml.cpp should be unicode and non-unicode compliant

Modified Paths:
--------------
    trunk/wired/src/xml/WiredXml.cpp
Modified: trunk/wired/src/xml/WiredXml.cpp
===================================================================
--- trunk/wired/src/xml/WiredXml.cpp	2006-07-02 22:15:21 UTC (rev 882)
+++ trunk/wired/src/xml/WiredXml.cpp	2006-07-04 11:46:47 UTC (rev 883)
@@ -78,7 +78,7 @@
 	if ((fd = open(_DtdFileName.mb_str(*wxConvCurrent), FLAGS_OPEN_RDONLY)) != INVALID_FD)
 	{
 		close(fd);
-		_DtdFile = xmlParseDTD(NULL, (const xmlChar*) _DtdFileName.mb_str(*wxConvCurrent).data());
+		_DtdFile = xmlParseDTD(NULL, ((const xmlChar*)(const char *)_DtdFileName.mb_str()));
 		if (_DtdFile != NULL)
 			return true;
 	}
@@ -209,16 +209,16 @@
 
 bool					WiredXml::WriteComment(const wxString& Comment, bool Ended)
 {
-	if (_DocumentWriter != NULL)
+  if (_DocumentWriter != NULL)
+    {
+      if (xmlTextWriterWriteComment(_DocumentWriter, ((xmlChar*)(const char *) Comment.mb_str())) >= 0)
 	{
-		if (xmlTextWriterWriteComment(_DocumentWriter, (xmlChar*) Comment.mb_str(*wxConvCurrent).data()) >= 0)
-		{
-			if (Ended == true)
-				return EndComment();
-			return true;
-		}		
-	}
-	return false;
+	  if (Ended == true)
+	    return EndComment();
+	  return true;
+	}		
+    }
+  return false;
 }
 
 bool					WiredXml::EndComment()
@@ -231,7 +231,7 @@
 bool					WiredXml::StartAttribute(const wxString& Name)
 {
   if (_DocumentWriter != NULL)
-    return (xmlTextWriterStartAttribute(_DocumentWriter, (xmlChar *) Name.mb_str(*wxConvCurrent).data()) >= 0);
+    return (xmlTextWriterStartAttribute(_DocumentWriter, ((xmlChar *)(const char *) Name.mb_str())) >= 0);
   return false;
 }
 		
@@ -240,8 +240,8 @@
   if (_DocumentWriter != NULL)
     {
       if (xmlTextWriterWriteAttribute(_DocumentWriter,
-				      (xmlChar*)Name.mb_str(*wxConvCurrent).data(),
-				      (xmlChar*)Content.mb_str(*wxConvCurrent).data()) >= 0)
+				      ((xmlChar*)(const char *)Name.mb_str()),
+				      ((xmlChar*)(const char *)Content.mb_str())) >= 0)
 	{
 	  if (Ended == true)
 	    return EndAttribute();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.