embedded sample compiles again

[wxWidgets.git] / wxPython / SWIG / swig.xmlout.patch

diff --git a/wxPython/SWIG/swig.xmlout.patch b/wxPython/SWIG/swig.xmlout.patch
index c67d056e6d5daf5f12207a1b521206034423ff76..ae17e1899ed74034da141370032ac33797f0a194 100644 (file)
--- a/wxPython/SWIG/swig.xmlout.patch
+++ b/wxPython/SWIG/swig.xmlout.patch
@@ -1,11 +1,11 @@
 Index: Source/Swig/swig.h
 ===================================================================
 RCS file: /cvsroot/SWIG/Source/Swig/swig.h,v
 Index: Source/Swig/swig.h
 ===================================================================
 RCS file: /cvsroot/SWIG/Source/Swig/swig.h,v

-retrieving revision 1.79
-diff -u -4 -r1.79 swig.h
---- Source/Swig/swig.h 15 Jan 2004 22:46:07 -0000      1.79
-+++ Source/Swig/swig.h 22 Jan 2004 01:57:53 -0000
-@@ -354,8 +354,10 @@
+retrieving revision 1.81
+diff -u -4 -r1.81 swig.h
+--- Source/Swig/swig.h 27 Jan 2004 23:39:35 -0000      1.81
++++ Source/Swig/swig.h 30 Jan 2004 22:22:10 -0000
+@@ -364,8 +364,10 @@

  extern void Swig_print_tags(File *obj, Node *root);
  extern void Swig_print_tree(Node *obj);
  extern void Swig_print_node(Node *obj);
  extern void Swig_print_tags(File *obj, Node *root);
  extern void Swig_print_tree(Node *obj);
  extern void Swig_print_node(Node *obj);


@@ -19,11 +19,11 @@ diff -u -4 -r1.79 swig.h
 Index: Source/Modules/main.cxx
 ===================================================================
 RCS file: /cvsroot/SWIG/Source/Modules/main.cxx,v
 Index: Source/Modules/main.cxx
 ===================================================================
 RCS file: /cvsroot/SWIG/Source/Modules/main.cxx,v

-retrieving revision 1.32
-diff -u -4 -r1.32 main.cxx
---- Source/Modules/main.cxx    15 Jan 2004 22:46:05 -0000      1.32
-+++ Source/Modules/main.cxx    22 Jan 2004 01:57:53 -0000
-@@ -94,15 +94,17 @@
+retrieving revision 1.33
+diff -u -4 -r1.33 main.cxx
+--- Source/Modules/main.cxx    22 Jan 2004 22:42:15 -0000      1.33
++++ Source/Modules/main.cxx    30 Jan 2004 22:22:11 -0000
+@@ -91,15 +91,17 @@

                               -w+321,401,-402 \n\
                                               \n\
                         where code 321(+) is added, and 401(no sign) and 402(-) \n\
                               -w+321,401,-402 \n\
                                               \n\
                         where code 321(+) is added, and 401(no sign) and 402(-) \n\


@@ -41,7 +41,7 @@ diff -u -4 -r1.32 main.cxx
  // -----------------------------------------------------------------------------
  // check_suffix(char *name)
  //
  // -----------------------------------------------------------------------------
  // check_suffix(char *name)
  //

-@@ -218,8 +220,9 @@
+@@ -215,8 +217,9 @@

    char   *includefiles[256];
    int     includecount = 0;
    int     dump_tags = 0;
    char   *includefiles[256];
    int     includecount = 0;
    int     dump_tags = 0;


@@ -51,7 +51,7 @@ diff -u -4 -r1.32 main.cxx
    int     dump_typedef = 0;
    int     dump_classes = 0;
    int     werror = 0;
    int     dump_typedef = 0;
    int     dump_classes = 0;
    int     werror = 0;

-@@ -486,8 +489,20 @@
+@@ -483,8 +486,20 @@

            Swig_mark_arg(i);
          } else if (strcmp(argv[i],"-dump_tree") == 0) {
            dump_tree = 1;
            Swig_mark_arg(i);
          } else if (strcmp(argv[i],"-dump_tree") == 0) {
            dump_tree = 1;


@@ -72,7 +72,7 @@ diff -u -4 -r1.32 main.cxx
            Swig_mark_arg(i);
            Swig_contract_mode_set(0);
          } else if (strcmp(argv[i],"-browse") == 0) {
            Swig_mark_arg(i);
            Swig_contract_mode_set(0);
          } else if (strcmp(argv[i],"-browse") == 0) {

-@@ -737,8 +752,11 @@
+@@ -734,8 +749,11 @@

        }
      }
      if (dump_tree) {
        }
      }
      if (dump_tree) {


@@ -87,21 +87,10 @@ diff -u -4 -r1.32 main.cxx
 Index: Source/Modules/xml.cxx
 ===================================================================
 RCS file: /cvsroot/SWIG/Source/Modules/xml.cxx,v
 Index: Source/Modules/xml.cxx
 ===================================================================
 RCS file: /cvsroot/SWIG/Source/Modules/xml.cxx,v

-retrieving revision 1.9
-diff -u -4 -r1.9 xml.cxx
---- Source/Modules/xml.cxx     28 Dec 2003 21:47:58 -0000      1.9
-+++ Source/Modules/xml.cxx     22 Jan 2004 01:57:53 -0000
-@@ -109,9 +109,9 @@
-                               Printf(stderr,"*** Can't open '%s'\n", outfile);
-                               SWIG_exit(EXIT_FAILURE);
-                       }
-               }
--              Printf( out, "<?xml version=\"1.0\" ?> \n" );
-+                Printf( out, "<?xml version=\"1.0\" ?> \n" );    
-               Xml_print_tree(n);
-       return SWIG_OK;
-       }
- 
+retrieving revision 1.10
+diff -u -4 -r1.10 xml.cxx
+--- Source/Modules/xml.cxx     22 Jan 2004 22:42:18 -0000      1.10
++++ Source/Modules/xml.cxx     30 Jan 2004 22:22:11 -0000

 @@ -197,18 +197,19 @@
                                        Replaceall( o, "&", "&amp;" );
                                        Replaceall( o, "<", "&lt;" );
 @@ -197,18 +197,19 @@
                                        Replaceall( o, "&", "&amp;" );
                                        Replaceall( o, "<", "&lt;" );


@@ -137,11 +126,11 @@ diff -u -4 -r1.9 xml.cxx
                }
                indent_level -= 4;
                print_indent(0);
                }
                indent_level -= 4;
                print_indent(0);

-@@ -334,5 +334,36 @@
- 
- extern "C" Language *
- swig_xml( void ) {
+@@ -336,5 +336,36 @@

          return new XML();
          return new XML();

+ }
+ extern "C" Language * swig_xml( void ) {
+         return new_swig_xml();

 +}
 +
 +
 +}
 +
 +