From 14ab1796658e31cc2cc6acdc045e16b605a72708 Mon Sep 17 00:00:00 2001
From: lazarus <lazarus@lazarus-ide.org>
Date: Sun, 4 Aug 2002 07:44:44 +0000
Subject: [PATCH] MG: fixed xml reading writing of special chars

git-svn-id: trunk@1817 -
---
 components/codetools/laz_xmlread.pas  |  4 ++++
 components/codetools/laz_xmlwrite.pas | 13 ++++++++-----
 lcl/interfaces/gtk/gtkcallback.inc    |  7 +++++--
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/components/codetools/laz_xmlread.pas b/components/codetools/laz_xmlread.pas
index b4fc6ca122..18166f834d 100644
--- a/components/codetools/laz_xmlread.pas
+++ b/components/codetools/laz_xmlread.pas
@@ -324,6 +324,7 @@ begin
     begin
       FlushStringBuffer;
       ParseReference(attr);
+      OldBuf := buf;
     end else
     begin
       Inc(buf);
@@ -1173,6 +1174,9 @@ end.
 
 {
   $Log$
+  Revision 1.3  2002/08/04 07:44:44  lazarus
+  MG: fixed xml reading writing of special chars
+
   Revision 1.2  2002/07/30 14:36:28  lazarus
   MG: accelerated xmlread and xmlwrite
 
diff --git a/components/codetools/laz_xmlwrite.pas b/components/codetools/laz_xmlwrite.pas
index 513c181c5d..832bb2072b 100644
--- a/components/codetools/laz_xmlwrite.pas
+++ b/components/codetools/laz_xmlwrite.pas
@@ -202,9 +202,9 @@ const
   AmpStr = '&amp;';
 begin
   if c = '"' then
-    wrt(QuotStr, length(QuotStr))
+    wrtStr(QuotStr)
   else if c = '&' then
-    wrt(AmpStr, length(AmpStr))
+    wrtStr(AmpStr)
   else
     wrt(c,1);
 end;
@@ -216,11 +216,11 @@ const
   AmpStr = '&amp;';
 begin
   if c = '<' then
-    wrt(ltStr, length(ltStr))
+    wrtStr(ltStr)
   else if c = '>' then
-    wrt(gtStr, length(gtStr))
+    wrtStr(gtStr)
   else if c = '&' then
-    wrt(AmpStr, length(AmpStr))
+    wrtStr(AmpStr)
   else
     wrt(c,1);
 end;
@@ -479,6 +479,9 @@ end.
 
 {
   $Log$
+  Revision 1.3  2002/08/04 07:44:44  lazarus
+  MG: fixed xml reading writing of special chars
+
   Revision 1.2  2002/07/30 14:36:28  lazarus
   MG: accelerated xmlread and xmlwrite
 
diff --git a/lcl/interfaces/gtk/gtkcallback.inc b/lcl/interfaces/gtk/gtkcallback.inc
index c5bc34e323..8054bd7d64 100644
--- a/lcl/interfaces/gtk/gtkcallback.inc
+++ b/lcl/interfaces/gtk/gtkcallback.inc
@@ -619,8 +619,8 @@ begin
   //' GDK_BUTTON_RELEASE_MASK=',HexStr(Cardinal(GDK_BUTTON_RELEASE_MASK),8),
   //' Window=',HexStr(Cardinal(Widget^.Window),8)
   //);
-  if GetFixedWidget(Widget)<>nil then
-    writeln('DDD2 ClientWindow=',HexStr(Cardinal(PGtkWidget(GetFixedWidget(Widget))^.Window),8));
+  //if GetFixedWidget(Widget)<>nil then
+  //  writeln('DDD2 ClientWindow=',HexStr(Cardinal(PGtkWidget(GetFixedWidget(Widget))^.Window),8));
 
   EventTrace('Mouse button Press', data);
   Assert(False, Format('Trace:[gtkMouseBtnPress] ', []));
@@ -2169,6 +2169,9 @@ end;
 { =============================================================================
 
   $Log$
+  Revision 1.95  2002/08/04 07:44:44  lazarus
+  MG: fixed xml reading writing of special chars
+
   Revision 1.94  2002/08/04 07:09:27  lazarus
   MG: fixed client events