From 296c948db1b5272b821327389eb058d21d9a010c Mon Sep 17 00:00:00 2001 From: Mike Kestner Date: Tue, 31 Jul 2007 18:29:13 +0000 Subject: [PATCH] 2007-07-31 Mike Kestner * generator/Ctor.cs : Validate before generating and adjust protection on a couple private methods. * generator/Parameters.cs : remove unused var to kill warning. svn path=/trunk/gtk-sharp/; revision=83132 --- ChangeLog | 6 ++++++ generator/Ctor.cs | 7 +++++-- generator/Parameters.cs | 2 -- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index e9b960b15..da34fa321 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-07-31 Mike Kestner + + * generator/Ctor.cs : Validate before generating and adjust protection + on a couple private methods. + * generator/Parameters.cs : remove unused var to kill warning. + 2007-07-30 Mike Kestner * generator/MethodBody.cs : refactor finish logic into parameter. diff --git a/generator/Ctor.cs b/generator/Ctor.cs index d8c184225..5997abbb0 100644 --- a/generator/Ctor.cs +++ b/generator/Ctor.cs @@ -61,14 +61,14 @@ namespace GtkSharp.Generation { } } - public void GenerateImport (StreamWriter sw) + void GenerateImport (StreamWriter sw) { sw.WriteLine("\t\t[DllImport(\"" + LibraryName + "\")]"); sw.WriteLine("\t\tstatic extern " + Safety + "IntPtr " + CName + "(" + ImportSignature + ");"); sw.WriteLine(); } - public void GenerateStatic (GenerationInfo gen_info) + void GenerateStatic (GenerationInfo gen_info) { StreamWriter sw = gen_info.Writer; sw.WriteLine("\t\tpublic static " + Safety + Modifiers + name + " " + StaticName + "(" + Signature + ")"); @@ -89,6 +89,9 @@ namespace GtkSharp.Generation { public void Generate (GenerationInfo gen_info) { + if (!Validate ()) + return; + StreamWriter sw = gen_info.Writer; gen_info.CurrentMember = CName; diff --git a/generator/Parameters.cs b/generator/Parameters.cs index 7465d93d6..ded7dd9ab 100644 --- a/generator/Parameters.cs +++ b/generator/Parameters.cs @@ -366,13 +366,11 @@ namespace GtkSharp.Generation { public class ArrayCountPair : ArrayParameter { - XmlElement array_elem; XmlElement count_elem; bool invert; public ArrayCountPair (XmlElement array_elem, XmlElement count_elem, bool invert) : base (array_elem) { - this.array_elem = array_elem; this.count_elem = count_elem; this.invert = invert; }