wxPrinting fix for wxMGL

[wxWidgets.git] / src / xrc / xml.cpp

diff --git a/src/xrc/xml.cpp b/src/xrc/xml.cpp
index 692a39f0bc46542a709a57c27ded120fb0245259..a1c6a01796dcc8c1f13f3fcb0f758d24c6df6dea 100644 (file)
--- a/src/xrc/xml.cpp
+++ b/src/xrc/xml.cpp
@@ -332,7 +332,7 @@ bool wxXmlDocument::Save(const wxString& filename) const
 //  wxXmlDocument loading routines
 //-----------------------------------------------------------------------------
 
 //  wxXmlDocument loading routines
 //-----------------------------------------------------------------------------
 

-/* 
+/*

     FIXME:
        - process all elements, including CDATA
  */
     FIXME:
        - process all elements, including CDATA
  */


@@ -349,12 +349,13 @@ inline static wxString CharToString(wxMBConv *conv,
     {
         size_t nLen = (len != wxSTRING_MAXLEN) ? len :
                           nLen = wxConvUTF8.MB2WC((wchar_t*) NULL, s, 0);
     {
         size_t nLen = (len != wxSTRING_MAXLEN) ? len :
                           nLen = wxConvUTF8.MB2WC((wchar_t*) NULL, s, 0);

-    
+

         wchar_t *buf = new wchar_t[nLen+1];
         wxConvUTF8.MB2WC(buf, s, nLen);
         buf[nLen] = 0;
         wchar_t *buf = new wchar_t[nLen+1];
         wxConvUTF8.MB2WC(buf, s, nLen);
         buf[nLen] = 0;

-        return wxString(buf, *conv, len);
+        wxString s(buf, *conv, len);

         delete[] buf;
         delete[] buf;

+        return s;

     }
     else
         return wxString(s, len);
     }
     else
         return wxString(s, len);


@@ -469,25 +470,25 @@ static int UnknownEncodingHnd(void * WXUNUSED(encodingHandlerData),
     // We must build conversion table for expat. The easiest way to do so
     // is to let wxCSConv convert as string containing all characters to
     // wide character representation:
     // We must build conversion table for expat. The easiest way to do so
     // is to let wxCSConv convert as string containing all characters to
     // wide character representation:

-    wxCSConv conv(name);
+    wxCSConv conv(wxString(name, wxConvLibc));

     char mbBuf[255];
     wchar_t wcBuf[255];
     size_t i;
     char mbBuf[255];
     wchar_t wcBuf[255];
     size_t i;

-    
+

     for (i = 0; i < 255; i++)
     for (i = 0; i < 255; i++)

-        mbBuf[i] = i+1;
+        mbBuf[i] = (char) (i+1);

     mbBuf[255] = 0;
     conv.MB2WC(wcBuf, mbBuf, 255);
     wcBuf[255] = 0;
     mbBuf[255] = 0;
     conv.MB2WC(wcBuf, mbBuf, 255);
     wcBuf[255] = 0;

-    
+

     info->map[0] = 0;
     for (i = 0; i < 255; i++)
         info->map[i+1] = (int)wcBuf[i];
     info->map[0] = 0;
     for (i = 0; i < 255; i++)
         info->map[i+1] = (int)wcBuf[i];

-    
+

     info->data = NULL;
     info->convert = NULL;
     info->release = NULL;
     info->data = NULL;
     info->convert = NULL;
     info->release = NULL;

-    
+

     return 1;
 }
 
     return 1;
 }
 


@@ -512,7 +513,7 @@ bool wxXmlDocument::Load(wxInputStream& stream, const wxString& encoding)
     if ( encoding != wxT("UTF-8") && encoding != wxT("utf-8") )
         ctx.conv = new wxCSConv(encoding);
 #endif
     if ( encoding != wxT("UTF-8") && encoding != wxT("utf-8") )
         ctx.conv = new wxCSConv(encoding);
 #endif

-    
+

     XML_SetUserData(parser, (void*)&ctx);
     XML_SetElementHandler(parser, StartElementHnd, EndElementHnd);
     XML_SetCharacterDataHandler(parser, TextHnd);
     XML_SetUserData(parser, (void*)&ctx);
     XML_SetElementHandler(parser, StartElementHnd, EndElementHnd);
     XML_SetCharacterDataHandler(parser, TextHnd);


@@ -542,7 +543,7 @@ bool wxXmlDocument::Load(wxInputStream& stream, const wxString& encoding)
     if ( ctx.conv )
         delete ctx.conv;
 #endif
     if ( ctx.conv )
         delete ctx.conv;
 #endif

-    
+

     return TRUE;
 
 }
     return TRUE;
 
 }


@@ -559,7 +560,7 @@ inline static void OutputString(wxOutputStream& stream, const wxString& str,
 {
     if (str.IsEmpty()) return;
 #if wxUSE_UNICODE
 {
     if (str.IsEmpty()) return;
 #if wxUSE_UNICODE

-    const wxW2MBbuf *buf = str.mb_str(convFile ? *convFile : wxConvUTF8);
+    const wxWX2MBbuf buf(str.mb_str(convFile ? *convFile : wxConvUTF8));

     stream.Write((const char*)buf, strlen((const char*)buf));
 #else
     if ( convFile == NULL )
     stream.Write((const char*)buf, strlen((const char*)buf));
 #else
     if ( convFile == NULL )


@@ -572,7 +573,7 @@ inline static void OutputString(wxOutputStream& stream, const wxString& str,
 #endif
 }
 
 #endif
 }
 

-// Same as above, but create entities first. 
+// Same as above, but create entities first.

 // Translates '<' to "&lt;", '>' to "&gt;" and '&' to "&amp;"
 static void OutputStringEnt(wxOutputStream& stream, const wxString& str,
                             wxMBConv *convMem, wxMBConv *convFile)
 // Translates '<' to "&lt;", '>' to "&gt;" and '&' to "&amp;"
 static void OutputStringEnt(wxOutputStream& stream, const wxString& str,
                             wxMBConv *convMem, wxMBConv *convFile)


@@ -580,25 +581,25 @@ static void OutputStringEnt(wxOutputStream& stream, const wxString& str,
     wxString buf;
     size_t i, last, len;
     wxChar c;
     wxString buf;
     size_t i, last, len;
     wxChar c;

-    
+

     len = str.Len();
     last = 0;
     for (i = 0; i < len; i++)
     {
         c = str.GetChar(i);
     len = str.Len();
     last = 0;
     for (i = 0; i < len; i++)
     {
         c = str.GetChar(i);

-        if (c == wxT('<') || c == wxT('>') || 
+        if (c == wxT('<') || c == wxT('>') ||

             (c == wxT('&') && str.Mid(i+1, 4) != wxT("amp;")))
         {
             OutputString(stream, str.Mid(last, i - last), convMem, convFile);
             switch (c)
             {
             (c == wxT('&') && str.Mid(i+1, 4) != wxT("amp;")))
         {
             OutputString(stream, str.Mid(last, i - last), convMem, convFile);
             switch (c)
             {

-                case wxT('<'): 
+                case wxT('<'):

                     OutputString(stream, wxT("&lt;"), NULL, NULL);
                     break;
                     OutputString(stream, wxT("&lt;"), NULL, NULL);
                     break;

-                case wxT('>'): 
+                case wxT('>'):

                     OutputString(stream, wxT("&gt;"), NULL, NULL);
                     break;
                     OutputString(stream, wxT("&gt;"), NULL, NULL);
                     break;

-                case wxT('&'): 
+                case wxT('&'):

                     OutputString(stream, wxT("&amp;"), NULL, NULL);
                     break;
                 default: break;
                     OutputString(stream, wxT("&amp;"), NULL, NULL);
                     break;
                 default: break;


@@ -628,11 +629,11 @@ static void OutputNode(wxOutputStream& stream, wxXmlNode *node, int indent,
         case wxXML_TEXT_NODE:
             OutputStringEnt(stream, node->GetContent(), convMem, convFile);
             break;
         case wxXML_TEXT_NODE:
             OutputStringEnt(stream, node->GetContent(), convMem, convFile);
             break;

-            
+

         case wxXML_ELEMENT_NODE:
             OutputString(stream, wxT("<"), NULL, NULL);
             OutputString(stream, node->GetName(), NULL, NULL);
         case wxXML_ELEMENT_NODE:
             OutputString(stream, wxT("<"), NULL, NULL);
             OutputString(stream, node->GetName(), NULL, NULL);

-            
+

             prop = node->GetProperties();
             while (prop)
             {
             prop = node->GetProperties();
             while (prop)
             {


@@ -642,7 +643,7 @@ static void OutputNode(wxOutputStream& stream, wxXmlNode *node, int indent,
                 // FIXME - what if prop contains '"'?
                 prop = prop->GetNext();
             }
                 // FIXME - what if prop contains '"'?
                 prop = prop->GetNext();
             }

-            
+

             if (node->GetChildren())
             {
                 OutputString(stream, wxT(">"), NULL, NULL);
             if (node->GetChildren())
             {
                 OutputString(stream, wxT(">"), NULL, NULL);


@@ -665,13 +666,13 @@ static void OutputNode(wxOutputStream& stream, wxXmlNode *node, int indent,
             else
                 OutputString(stream, wxT("/>"), NULL, NULL);
             break;
             else
                 OutputString(stream, wxT("/>"), NULL, NULL);
             break;

-             
+

         case wxXML_COMMENT_NODE:
             OutputString(stream, wxT("<!--"), NULL, NULL);
             OutputString(stream, node->GetContent(), convMem, convFile);
             OutputString(stream, wxT("-->"), NULL, NULL);
             break;
         case wxXML_COMMENT_NODE:
             OutputString(stream, wxT("<!--"), NULL, NULL);
             OutputString(stream, node->GetContent(), convMem, convFile);
             OutputString(stream, wxT("-->"), NULL, NULL);
             break;

-            
+

         default:
             wxFAIL_MSG(wxT("unsupported node type"));
     }
         default:
             wxFAIL_MSG(wxT("unsupported node type"));
     }


@@ -681,9 +682,9 @@ bool wxXmlDocument::Save(wxOutputStream& stream) const
 {
     if ( !IsOk() )
         return FALSE;
 {
     if ( !IsOk() )
         return FALSE;

-        
+

     wxString s;
     wxString s;

-    
+

     wxMBConv *convMem = NULL, *convFile = NULL;
 #if wxUSE_UNICODE
     convFile = new wxCSConv(GetFileEncoding());
     wxMBConv *convMem = NULL, *convFile = NULL;
 #if wxUSE_UNICODE
     convFile = new wxCSConv(GetFileEncoding());


@@ -694,18 +695,18 @@ bool wxXmlDocument::Save(wxOutputStream& stream) const
         convMem = new wxCSConv(GetEncoding());
     }
 #endif
         convMem = new wxCSConv(GetEncoding());
     }
 #endif

-    
+

     s.Printf(wxT("<?xml version=\"%s\" encoding=\"%s\"?>\n"),
              GetVersion().c_str(), GetFileEncoding().c_str());
     OutputString(stream, s, NULL, NULL);
     s.Printf(wxT("<?xml version=\"%s\" encoding=\"%s\"?>\n"),
              GetVersion().c_str(), GetFileEncoding().c_str());
     OutputString(stream, s, NULL, NULL);

-    
+

     OutputNode(stream, GetRoot(), 0, convMem, convFile);
     OutputString(stream, wxT("\n"), NULL, NULL);
     OutputNode(stream, GetRoot(), 0, convMem, convFile);
     OutputString(stream, wxT("\n"), NULL, NULL);

-    
+

     if ( convFile )
         delete convFile;
     if ( convMem )
         delete convMem;
     if ( convFile )
         delete convFile;
     if ( convMem )
         delete convMem;

-        
+

     return TRUE;
 }
     return TRUE;
 }