Author: mmarin
Date: 2007-10-05 17:01:15 -0400 (Fri, 05 Oct 2007)
New Revision: 87014
Modified:
trunk/monodevelop/Extras/CBinding/CBinding.mdp
trunk/monodevelop/Extras/CBinding/ChangeLog
trunk/monodevelop/Extras/CBinding/Compiler/GNUCompiler.cs
trunk/monodevelop/Extras/CBinding/Gui/CodeGenerationPanel.cs
trunk/monodevelop/Extras/CBinding/Parser/TagDatabaseManager.cs
trunk/monodevelop/Extras/CBinding/Project/CCompilationParameters.cs
trunk/monodevelop/Extras/CBinding/gtk-gui/CBinding.CodeGenerationPanel.cs
trunk/monodevelop/Extras/CBinding/gtk-gui/gui.stetic
Log:
* Gui/CodeGenerationPanel.cs, Project/CCompilationParameters.cs,
gtk-gui/CBinding.CodeGenerationPanel.cs, gtk-gui/gui.stetic,
Compiler/GNUCompiler.cs: Added "Treat warnings as errors" option to
code generation panel and implemented it for gcc and g++.
* Parser/TagDatabaseManager.cs: Suppressed unused variable warning and
added checks for faulty ctags tags.
Modified: trunk/monodevelop/Extras/CBinding/CBinding.mdp
===================================================================
--- trunk/monodevelop/Extras/CBinding/CBinding.mdp 2007-10-05 20:53:20 UTC
(rev 87013)
+++ trunk/monodevelop/Extras/CBinding/CBinding.mdp 2007-10-05 21:01:15 UTC
(rev 87014)
@@ -146,7 +146,6 @@
<ProjectReference type="Gac" localcopy="True" refto="gdk-sharp,
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<ProjectReference type="Gac" localcopy="True" refto="gtk-sharp,
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
</References>
- <Deployment.LinuxDeployData scriptName="cbinding" />
<MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True"
RelativeMakefileName="./Makefile.am" SyncReferences="True"
IsAutotoolsProject="True" RelativeConfigureInPath="../../">
<BuildFilesVar Sync="True" Name="FILES" />
<DeployFilesVar />
@@ -156,5 +155,6 @@
<AsmRefVar Sync="True" Name="REFS" Prefix="-r:" />
<ProjectRefVar Sync="True" Name="REFS" Prefix="-r:" />
</MonoDevelop.Autotools.MakefileInfo>
+ <Deployment.LinuxDeployData scriptName="cbinding" />
<GtkDesignInfo gtkVersion="2.8.3" />
</Project>
\ No newline at end of file
Modified: trunk/monodevelop/Extras/CBinding/ChangeLog
===================================================================
--- trunk/monodevelop/Extras/CBinding/ChangeLog 2007-10-05 20:53:20 UTC (rev
87013)
+++ trunk/monodevelop/Extras/CBinding/ChangeLog 2007-10-05 21:01:15 UTC (rev
87014)
@@ -1,3 +1,12 @@
+2007-10-05 Marcos David Marín Amador <[EMAIL PROTECTED]>
+
+ * Gui/CodeGenerationPanel.cs, Project/CCompilationParameters.cs,
+ gtk-gui/CBinding.CodeGenerationPanel.cs, gtk-gui/gui.stetic,
+ Compiler/GNUCompiler.cs: Added "Treat warnings as errors" option to
code
+ generation panel and implemented it for gcc and g++.
+ * Parser/TagDatabaseManager.cs: Suppressed unused variable warning and
added
+ checks for faulty ctags tags.
+
2007-10-03 Michael Hutchinson <[EMAIL PROTECTED]>
* CBinding.mdp, gtk-gui/gui.stetic: Target GTK# 2.8.
Modified: trunk/monodevelop/Extras/CBinding/Compiler/GNUCompiler.cs
===================================================================
--- trunk/monodevelop/Extras/CBinding/Compiler/GNUCompiler.cs 2007-10-05
20:53:20 UTC (rev 87013)
+++ trunk/monodevelop/Extras/CBinding/Compiler/GNUCompiler.cs 2007-10-05
21:01:15 UTC (rev 87014)
@@ -160,6 +160,9 @@
break;
}
+ if (cp.WarningsAsErrors)
+ args.Append ("-Werror ");
+
args.Append ("-O" + cp.OptimizationLevel + " ");
if (cp.ExtraCompilerArguments != null &&
cp.ExtraCompilerArguments.Length > 0) {
@@ -614,7 +617,7 @@
bool CheckApp (string app)
{
try {
- ProcessWrapper p =
Runtime.ProcessService.StartProcess (linkerCommand, "--version", null, null);
+ ProcessWrapper p =
Runtime.ProcessService.StartProcess (app, "--version", null, null);
p.WaitForOutput ();
return true;
} catch {
Modified: trunk/monodevelop/Extras/CBinding/Gui/CodeGenerationPanel.cs
===================================================================
--- trunk/monodevelop/Extras/CBinding/Gui/CodeGenerationPanel.cs
2007-10-05 20:53:20 UTC (rev 87013)
+++ trunk/monodevelop/Extras/CBinding/Gui/CodeGenerationPanel.cs
2007-10-05 21:01:15 UTC (rev 87014)
@@ -82,6 +82,8 @@
break;
}
+ warningsAsErrorsCheckBox.Active =
compilationParameters.WarningsAsErrors;
+
optimizationSpinButton.Value =
compilationParameters.OptimizationLevel;
switch (configuration.CompileTarget)
@@ -194,6 +196,8 @@
else
compilationParameters.WarningLevel =
WarningLevel.All;
+ compilationParameters.WarningsAsErrors =
warningsAsErrorsCheckBox.Active;
+
compilationParameters.OptimizationLevel =
(int)optimizationSpinButton.Value;
switch (targetComboBox.ActiveText)
Modified: trunk/monodevelop/Extras/CBinding/Parser/TagDatabaseManager.cs
===================================================================
--- trunk/monodevelop/Extras/CBinding/Parser/TagDatabaseManager.cs
2007-10-05 20:53:20 UTC (rev 87013)
+++ trunk/monodevelop/Extras/CBinding/Parser/TagDatabaseManager.cs
2007-10-05 21:01:15 UTC (rev 87014)
@@ -195,7 +195,8 @@
Tag tag = ParseTag (tagEntry);
- AddInfo (fileInfo, tag, ctags_output);
+ if (tag != null)
+ AddInfo (fileInfo, tag,
ctags_output);
}
}
@@ -233,7 +234,8 @@
Tag tag = ParseTag (tagEntry);
- AddInfo (info, tag, ctags_output);
+ if (tag != null)
+ AddInfo (info, tag,
ctags_output);
}
}
@@ -344,6 +346,10 @@
i1 = i2 + 2;
i2 = tagEntry.IndexOf (delimiter, i1) - 1;
+ // apparentlty sometimes ctags will create faulty tags,
make sure this is not one of them
+ if (i2 < 0 || i1 < 0)
+ return null;
+
pattern = tagEntry.Substring (i1 + 1, i2 - i1 - 1);
tagField = tagEntry.Substring (i2 + 5);
@@ -361,12 +367,12 @@
if (index > 0) {
string key = field.Substring (0, index);
string val = field.Substring (index +
1);
+
switch (key) {
case "access":
try {
access =
(AccessModifier)System.Enum.Parse (typeof(AccessModifier), val, true);
- } catch (ArgumentException ae) {
- //This modifier (e.g.
"friend") not supported by parser
+ } catch (ArgumentException) {
}
break;
case "class":
@@ -512,7 +518,7 @@
if (tagEntry.Substring (0,
tagEntry.IndexOf ('\t')).Equals (name)) {
tag = ParseTag (tagEntry);
- if (tag.Kind == kind)
+ if (tag != null && tag.Kind ==
kind)
return tag;
}
}
@@ -539,7 +545,7 @@
if (tagEntry.Substring (0,
tagEntry.IndexOf ('\t')).Equals (name)) {
tag = ParseTag (tagEntry);
- if (tag.Kind == kind)
+ if (tag != null && tag.Kind ==
kind)
return tag;
}
}
Modified: trunk/monodevelop/Extras/CBinding/Project/CCompilationParameters.cs
===================================================================
--- trunk/monodevelop/Extras/CBinding/Project/CCompilationParameters.cs
2007-10-05 20:53:20 UTC (rev 87013)
+++ trunk/monodevelop/Extras/CBinding/Project/CCompilationParameters.cs
2007-10-05 21:01:15 UTC (rev 87014)
@@ -52,6 +52,9 @@
[ItemProperty ("WarningLevel")]
private WarningLevel warning_level = WarningLevel.Normal;
+ [ItemProperty ("WarningsAsErrors")]
+ private bool warnings_as_errors = false;
+
[ItemProperty ("OptimizationLevel")]
private int optimization = 0;
@@ -74,6 +77,11 @@
set { warning_level = value; }
}
+ public bool WarningsAsErrors {
+ get { return warnings_as_errors; }
+ set { warnings_as_errors = value; }
+ }
+
public int OptimizationLevel {
get { return optimization; }
set {
Modified:
trunk/monodevelop/Extras/CBinding/gtk-gui/CBinding.CodeGenerationPanel.cs
===================================================================
--- trunk/monodevelop/Extras/CBinding/gtk-gui/CBinding.CodeGenerationPanel.cs
2007-10-05 20:53:20 UTC (rev 87013)
+++ trunk/monodevelop/Extras/CBinding/gtk-gui/CBinding.CodeGenerationPanel.cs
2007-10-05 21:01:15 UTC (rev 87014)
@@ -37,6 +37,8 @@
private Gtk.RadioButton allWarningRadio;
+ private Gtk.CheckButton warningsAsErrorsCheckBox;
+
private Gtk.HBox hbox1;
private Gtk.Label label12;
@@ -216,7 +218,6 @@
this.noWarningRadio = new
Gtk.RadioButton(Mono.Unix.Catalog.GetString("no warnings"));
this.noWarningRadio.CanFocus = true;
this.noWarningRadio.Name = "noWarningRadio";
- this.noWarningRadio.Active = true;
this.noWarningRadio.DrawIndicator = true;
this.noWarningRadio.UseUnderline = true;
this.noWarningRadio.Group = new GLib.SList(System.IntPtr.Zero);
@@ -249,17 +250,29 @@
w8.Position = 2;
w8.Expand = false;
w8.Fill = false;
+ // Container child vbox1.Gtk.Box+BoxChild
+ this.warningsAsErrorsCheckBox = new Gtk.CheckButton();
+ this.warningsAsErrorsCheckBox.CanFocus = true;
+ this.warningsAsErrorsCheckBox.Name = "warningsAsErrorsCheckBox";
+ this.warningsAsErrorsCheckBox.Label =
Mono.Unix.Catalog.GetString("Treat warnings as errors");
+ this.warningsAsErrorsCheckBox.DrawIndicator = true;
+ this.warningsAsErrorsCheckBox.UseUnderline = true;
+ this.vbox1.Add(this.warningsAsErrorsCheckBox);
+ Gtk.Box.BoxChild w9 =
((Gtk.Box.BoxChild)(this.vbox1[this.warningsAsErrorsCheckBox]));
+ w9.Position = 3;
+ w9.Expand = false;
+ w9.Fill = false;
this.table1.Add(this.vbox1);
- Gtk.Table.TableChild w9 =
((Gtk.Table.TableChild)(this.table1[this.vbox1]));
- w9.LeftAttach = ((uint)(1));
- w9.RightAttach = ((uint)(2));
- w9.XOptions = ((Gtk.AttachOptions)(4));
- w9.YOptions = ((Gtk.AttachOptions)(4));
+ Gtk.Table.TableChild w10 =
((Gtk.Table.TableChild)(this.table1[this.vbox1]));
+ w10.LeftAttach = ((uint)(1));
+ w10.RightAttach = ((uint)(2));
+ w10.XOptions = ((Gtk.AttachOptions)(4));
+ w10.YOptions = ((Gtk.AttachOptions)(4));
this.vbox6.Add(this.table1);
- Gtk.Box.BoxChild w10 =
((Gtk.Box.BoxChild)(this.vbox6[this.table1]));
- w10.Position = 0;
- w10.Expand = false;
- w10.Fill = false;
+ Gtk.Box.BoxChild w11 =
((Gtk.Box.BoxChild)(this.vbox6[this.table1]));
+ w11.Position = 0;
+ w11.Expand = false;
+ w11.Fill = false;
// Container child vbox6.Gtk.Box+BoxChild
this.hbox1 = new Gtk.HBox();
this.hbox1.Name = "hbox1";
@@ -271,27 +284,27 @@
this.label12.Xalign = 0F;
this.label12.LabelProp = Mono.Unix.Catalog.GetString("Define
Symbols:");
this.hbox1.Add(this.label12);
- Gtk.Box.BoxChild w11 =
((Gtk.Box.BoxChild)(this.hbox1[this.label12]));
- w11.Position = 0;
- w11.Expand = false;
- w11.Fill = false;
+ Gtk.Box.BoxChild w12 =
((Gtk.Box.BoxChild)(this.hbox1[this.label12]));
+ w12.Position = 0;
+ w12.Expand = false;
+ w12.Fill = false;
// Container child hbox1.Gtk.Box+BoxChild
this.defineSymbolsTextEntry = new Gtk.Entry();
- Gtk.Tooltips w12 = new Gtk.Tooltips();
- w12.SetTip(this.defineSymbolsTextEntry, "A space seperated list of
symbols to define.", "A space seperated list of symbols to define.");
+ Gtk.Tooltips w13 = new Gtk.Tooltips();
+ w13.SetTip(this.defineSymbolsTextEntry, "A space seperated list of
symbols to define.", "A space seperated list of symbols to define.");
this.defineSymbolsTextEntry.CanFocus = true;
this.defineSymbolsTextEntry.Name = "defineSymbolsTextEntry";
this.defineSymbolsTextEntry.IsEditable = true;
this.defineSymbolsTextEntry.InvisibleChar = '●';
this.hbox1.Add(this.defineSymbolsTextEntry);
- Gtk.Box.BoxChild w13 =
((Gtk.Box.BoxChild)(this.hbox1[this.defineSymbolsTextEntry]));
- w13.Position = 1;
- w13.Padding = ((uint)(14));
+ Gtk.Box.BoxChild w14 =
((Gtk.Box.BoxChild)(this.hbox1[this.defineSymbolsTextEntry]));
+ w14.Position = 1;
+ w14.Padding = ((uint)(14));
this.vbox6.Add(this.hbox1);
- Gtk.Box.BoxChild w14 =
((Gtk.Box.BoxChild)(this.vbox6[this.hbox1]));
- w14.Position = 1;
- w14.Expand = false;
- w14.Fill = false;
+ Gtk.Box.BoxChild w15 =
((Gtk.Box.BoxChild)(this.vbox6[this.hbox1]));
+ w15.Position = 1;
+ w15.Expand = false;
+ w15.Fill = false;
// Container child vbox6.Gtk.Box+BoxChild
this.frame2 = new Gtk.Frame();
this.frame2.Name = "frame2";
@@ -314,20 +327,20 @@
this.label11.Xalign = 0F;
this.label11.LabelProp = Mono.Unix.Catalog.GetString("Extra Linker
Options");
this.table5.Add(this.label11);
- Gtk.Table.TableChild w15 =
((Gtk.Table.TableChild)(this.table5[this.label11]));
- w15.LeftAttach = ((uint)(1));
- w15.RightAttach = ((uint)(2));
- w15.XOptions = ((Gtk.AttachOptions)(4));
- w15.YOptions = ((Gtk.AttachOptions)(4));
+ Gtk.Table.TableChild w16 =
((Gtk.Table.TableChild)(this.table5[this.label11]));
+ w16.LeftAttach = ((uint)(1));
+ w16.RightAttach = ((uint)(2));
+ w16.XOptions = ((Gtk.AttachOptions)(4));
+ w16.YOptions = ((Gtk.AttachOptions)(4));
// Container child table5.Gtk.Table+TableChild
this.label7 = new Gtk.Label();
this.label7.Name = "label7";
this.label7.Xalign = 0F;
this.label7.LabelProp = Mono.Unix.Catalog.GetString("Extra
Compiler Options");
this.table5.Add(this.label7);
- Gtk.Table.TableChild w16 =
((Gtk.Table.TableChild)(this.table5[this.label7]));
- w16.XOptions = ((Gtk.AttachOptions)(4));
- w16.YOptions = ((Gtk.AttachOptions)(4));
+ Gtk.Table.TableChild w17 =
((Gtk.Table.TableChild)(this.table5[this.label7]));
+ w17.XOptions = ((Gtk.AttachOptions)(4));
+ w17.YOptions = ((Gtk.AttachOptions)(4));
// Container child table5.Gtk.Table+TableChild
this.scrolledwindow4 = new Gtk.ScrolledWindow();
this.scrolledwindow4.CanFocus = true;
@@ -337,14 +350,14 @@
this.scrolledwindow4.ShadowType = ((Gtk.ShadowType)(1));
// Container child scrolledwindow4.Gtk.Container+ContainerChild
this.extraCompilerTextView = new Gtk.TextView();
- w12.SetTip(this.extraCompilerTextView, "A newline seperated list
of extra options to send to the compiler.\nOne option can be in more than one
line.\nExample:\n\t`pkg-config\n\t--cflags\n\tcairo`", "A newline seperated
list of extra options to send to the compiler.\nOne option can be in more than
one line.\nExample:\n\t`pkg-config\n\t--cflags\n\tcairo`");
+ w13.SetTip(this.extraCompilerTextView, "A newline seperated list
of extra options to send to the compiler.\nOne option can be in more than one
line.\nExample:\n\t`pkg-config\n\t--cflags\n\tcairo`", "A newline seperated
list of extra options to send to the compiler.\nOne option can be in more than
one line.\nExample:\n\t`pkg-config\n\t--cflags\n\tcairo`");
this.extraCompilerTextView.CanFocus = true;
this.extraCompilerTextView.Name = "extraCompilerTextView";
this.scrolledwindow4.Add(this.extraCompilerTextView);
this.table5.Add(this.scrolledwindow4);
- Gtk.Table.TableChild w18 =
((Gtk.Table.TableChild)(this.table5[this.scrolledwindow4]));
- w18.TopAttach = ((uint)(1));
- w18.BottomAttach = ((uint)(2));
+ Gtk.Table.TableChild w19 =
((Gtk.Table.TableChild)(this.table5[this.scrolledwindow4]));
+ w19.TopAttach = ((uint)(1));
+ w19.BottomAttach = ((uint)(2));
// Container child table5.Gtk.Table+TableChild
this.scrolledwindow5 = new Gtk.ScrolledWindow();
this.scrolledwindow5.CanFocus = true;
@@ -354,16 +367,17 @@
this.scrolledwindow5.ShadowType = ((Gtk.ShadowType)(1));
// Container child scrolledwindow5.Gtk.Container+ContainerChild
this.extraLinkerTextView = new Gtk.TextView();
- w12.SetTip(this.extraLinkerTextView, "A newline seperated list of
extra options to send to the linker.\nOne option can be in more than one
line.\nExample:\n\t`pkg-config\n\t--libs\n\tcairo`", "A newline seperated list
of extra options to send to the linker.\nOne option can be in more than one
line.\nExample:\n\t`pkg-config\n\t--libs\n\tcairo`");
+ w13.SetTip(this.extraLinkerTextView, "A newline seperated list of
extra options to send to the linker.\nOne option can be in more than one
line.\nExample:\n\t`pkg-config\n\t--libs\n\tcairo`", "A newline seperated list
of extra options to send to the linker.\nOne option can be in more than one
line.\nExample:\n\t`pkg-config\n\t--libs\n\tcairo`");
this.extraLinkerTextView.CanFocus = true;
this.extraLinkerTextView.Name = "extraLinkerTextView";
this.scrolledwindow5.Add(this.extraLinkerTextView);
this.table5.Add(this.scrolledwindow5);
- Gtk.Table.TableChild w20 =
((Gtk.Table.TableChild)(this.table5[this.scrolledwindow5]));
- w20.TopAttach = ((uint)(1));
- w20.BottomAttach = ((uint)(2));
- w20.LeftAttach = ((uint)(1));
- w20.RightAttach = ((uint)(2));
+ Gtk.Table.TableChild w21 =
((Gtk.Table.TableChild)(this.table5[this.scrolledwindow5]));
+ w21.TopAttach = ((uint)(1));
+ w21.BottomAttach = ((uint)(2));
+ w21.LeftAttach = ((uint)(1));
+ w21.RightAttach = ((uint)(2));
+ w21.YOptions = ((Gtk.AttachOptions)(4));
this.GtkAlignment.Add(this.table5);
this.frame2.Add(this.GtkAlignment);
this.GtkLabel12 = new Gtk.Label();
@@ -372,11 +386,11 @@
this.GtkLabel12.UseMarkup = true;
this.frame2.LabelWidget = this.GtkLabel12;
this.vbox6.Add(this.frame2);
- Gtk.Box.BoxChild w23 =
((Gtk.Box.BoxChild)(this.vbox6[this.frame2]));
- w23.Position = 2;
+ Gtk.Box.BoxChild w24 =
((Gtk.Box.BoxChild)(this.vbox6[this.frame2]));
+ w24.Position = 2;
this.notebook1.Add(this.vbox6);
- Gtk.Notebook.NotebookChild w24 =
((Gtk.Notebook.NotebookChild)(this.notebook1[this.vbox6]));
- w24.TabExpand = false;
+ Gtk.Notebook.NotebookChild w25 =
((Gtk.Notebook.NotebookChild)(this.notebook1[this.vbox6]));
+ w25.TabExpand = false;
// Notebook tab
this.label1 = new Gtk.Label();
this.label1.Name = "label1";
@@ -397,19 +411,19 @@
this.addLibButton.UseUnderline = true;
this.addLibButton.Label = Mono.Unix.Catalog.GetString("Add");
this.table2.Add(this.addLibButton);
- Gtk.Table.TableChild w25 =
((Gtk.Table.TableChild)(this.table2[this.addLibButton]));
- w25.LeftAttach = ((uint)(2));
- w25.RightAttach = ((uint)(3));
- w25.XOptions = ((Gtk.AttachOptions)(4));
- w25.YOptions = ((Gtk.AttachOptions)(4));
+ Gtk.Table.TableChild w26 =
((Gtk.Table.TableChild)(this.table2[this.addLibButton]));
+ w26.LeftAttach = ((uint)(2));
+ w26.RightAttach = ((uint)(3));
+ w26.XOptions = ((Gtk.AttachOptions)(4));
+ w26.YOptions = ((Gtk.AttachOptions)(4));
// Container child table2.Gtk.Table+TableChild
this.label8 = new Gtk.Label();
this.label8.Name = "label8";
this.label8.LabelProp = Mono.Unix.Catalog.GetString("Library:");
this.table2.Add(this.label8);
- Gtk.Table.TableChild w26 =
((Gtk.Table.TableChild)(this.table2[this.label8]));
- w26.XOptions = ((Gtk.AttachOptions)(4));
- w26.YOptions = ((Gtk.AttachOptions)(4));
+ Gtk.Table.TableChild w27 =
((Gtk.Table.TableChild)(this.table2[this.label8]));
+ w27.XOptions = ((Gtk.AttachOptions)(4));
+ w27.YOptions = ((Gtk.AttachOptions)(4));
// Container child table2.Gtk.Table+TableChild
this.libAddEntry = new Gtk.Entry();
this.libAddEntry.CanFocus = true;
@@ -417,10 +431,10 @@
this.libAddEntry.IsEditable = true;
this.libAddEntry.InvisibleChar = '●';
this.table2.Add(this.libAddEntry);
- Gtk.Table.TableChild w27 =
((Gtk.Table.TableChild)(this.table2[this.libAddEntry]));
- w27.LeftAttach = ((uint)(1));
- w27.RightAttach = ((uint)(2));
- w27.YOptions = ((Gtk.AttachOptions)(4));
+ Gtk.Table.TableChild w28 =
((Gtk.Table.TableChild)(this.table2[this.libAddEntry]));
+ w28.LeftAttach = ((uint)(1));
+ w28.RightAttach = ((uint)(2));
+ w28.YOptions = ((Gtk.AttachOptions)(4));
// Container child table2.Gtk.Table+TableChild
this.scrolledwindow1 = new Gtk.ScrolledWindow();
this.scrolledwindow1.CanFocus = true;
@@ -435,11 +449,11 @@
this.libTreeView.HeadersClickable = true;
this.scrolledwindow1.Add(this.libTreeView);
this.table2.Add(this.scrolledwindow1);
- Gtk.Table.TableChild w29 =
((Gtk.Table.TableChild)(this.table2[this.scrolledwindow1]));
- w29.TopAttach = ((uint)(1));
- w29.BottomAttach = ((uint)(2));
- w29.LeftAttach = ((uint)(1));
- w29.RightAttach = ((uint)(2));
+ Gtk.Table.TableChild w30 =
((Gtk.Table.TableChild)(this.table2[this.scrolledwindow1]));
+ w30.TopAttach = ((uint)(1));
+ w30.BottomAttach = ((uint)(2));
+ w30.LeftAttach = ((uint)(1));
+ w30.RightAttach = ((uint)(2));
// Container child table2.Gtk.Table+TableChild
this.vbox4 = new Gtk.VBox();
this.vbox4.Name = "vbox4";
@@ -451,10 +465,10 @@
this.browseButton.UseUnderline = true;
this.browseButton.Label = Mono.Unix.Catalog.GetString("Browse...");
this.vbox4.Add(this.browseButton);
- Gtk.Box.BoxChild w30 =
((Gtk.Box.BoxChild)(this.vbox4[this.browseButton]));
- w30.Position = 0;
- w30.Expand = false;
- w30.Fill = false;
+ Gtk.Box.BoxChild w31 =
((Gtk.Box.BoxChild)(this.vbox4[this.browseButton]));
+ w31.Position = 0;
+ w31.Expand = false;
+ w31.Fill = false;
// Container child vbox4.Gtk.Box+BoxChild
this.removeLibButton = new Gtk.Button();
this.removeLibButton.Sensitive = false;
@@ -463,21 +477,21 @@
this.removeLibButton.UseUnderline = true;
this.removeLibButton.Label = Mono.Unix.Catalog.GetString("Remove");
this.vbox4.Add(this.removeLibButton);
- Gtk.Box.BoxChild w31 =
((Gtk.Box.BoxChild)(this.vbox4[this.removeLibButton]));
- w31.Position = 1;
- w31.Expand = false;
- w31.Fill = false;
+ Gtk.Box.BoxChild w32 =
((Gtk.Box.BoxChild)(this.vbox4[this.removeLibButton]));
+ w32.Position = 1;
+ w32.Expand = false;
+ w32.Fill = false;
this.table2.Add(this.vbox4);
- Gtk.Table.TableChild w32 =
((Gtk.Table.TableChild)(this.table2[this.vbox4]));
- w32.TopAttach = ((uint)(1));
- w32.BottomAttach = ((uint)(2));
- w32.LeftAttach = ((uint)(2));
- w32.RightAttach = ((uint)(3));
- w32.XOptions = ((Gtk.AttachOptions)(4));
+ Gtk.Table.TableChild w33 =
((Gtk.Table.TableChild)(this.table2[this.vbox4]));
+ w33.TopAttach = ((uint)(1));
+ w33.BottomAttach = ((uint)(2));
+ w33.LeftAttach = ((uint)(2));
+ w33.RightAttach = ((uint)(3));
+ w33.XOptions = ((Gtk.AttachOptions)(4));
this.notebook1.Add(this.table2);
- Gtk.Notebook.NotebookChild w33 =
((Gtk.Notebook.NotebookChild)(this.notebook1[this.table2]));
- w33.Position = 1;
- w33.TabExpand = false;
+ Gtk.Notebook.NotebookChild w34 =
((Gtk.Notebook.NotebookChild)(this.notebook1[this.table2]));
+ w34.Position = 1;
+ w34.TabExpand = false;
// Notebook tab
this.label2 = new Gtk.Label();
this.label2.Name = "label2";
@@ -499,9 +513,9 @@
this.label10.Name = "label10";
this.label10.LabelProp = Mono.Unix.Catalog.GetString("Library:");
this.table4.Add(this.label10);
- Gtk.Table.TableChild w34 =
((Gtk.Table.TableChild)(this.table4[this.label10]));
- w34.XOptions = ((Gtk.AttachOptions)(4));
- w34.YOptions = ((Gtk.AttachOptions)(4));
+ Gtk.Table.TableChild w35 =
((Gtk.Table.TableChild)(this.table4[this.label10]));
+ w35.XOptions = ((Gtk.AttachOptions)(4));
+ w35.YOptions = ((Gtk.AttachOptions)(4));
// Container child table4.Gtk.Table+TableChild
this.libPathAddButton = new Gtk.Button();
this.libPathAddButton.Sensitive = false;
@@ -510,11 +524,11 @@
this.libPathAddButton.UseUnderline = true;
this.libPathAddButton.Label = Mono.Unix.Catalog.GetString("Add");
this.table4.Add(this.libPathAddButton);
- Gtk.Table.TableChild w35 =
((Gtk.Table.TableChild)(this.table4[this.libPathAddButton]));
- w35.LeftAttach = ((uint)(2));
- w35.RightAttach = ((uint)(3));
- w35.XOptions = ((Gtk.AttachOptions)(4));
- w35.YOptions = ((Gtk.AttachOptions)(4));
+ Gtk.Table.TableChild w36 =
((Gtk.Table.TableChild)(this.table4[this.libPathAddButton]));
+ w36.LeftAttach = ((uint)(2));
+ w36.RightAttach = ((uint)(3));
+ w36.XOptions = ((Gtk.AttachOptions)(4));
+ w36.YOptions = ((Gtk.AttachOptions)(4));
// Container child table4.Gtk.Table+TableChild
this.libPathEntry = new Gtk.Entry();
this.libPathEntry.CanFocus = true;
@@ -522,10 +536,10 @@
this.libPathEntry.IsEditable = true;
this.libPathEntry.InvisibleChar = '●';
this.table4.Add(this.libPathEntry);
- Gtk.Table.TableChild w36 =
((Gtk.Table.TableChild)(this.table4[this.libPathEntry]));
- w36.LeftAttach = ((uint)(1));
- w36.RightAttach = ((uint)(2));
- w36.YOptions = ((Gtk.AttachOptions)(4));
+ Gtk.Table.TableChild w37 =
((Gtk.Table.TableChild)(this.table4[this.libPathEntry]));
+ w37.LeftAttach = ((uint)(1));
+ w37.RightAttach = ((uint)(2));
+ w37.YOptions = ((Gtk.AttachOptions)(4));
// Container child table4.Gtk.Table+TableChild
this.scrolledwindow3 = new Gtk.ScrolledWindow();
this.scrolledwindow3.CanFocus = true;
@@ -540,11 +554,11 @@
this.libPathTreeView.HeadersClickable = true;
this.scrolledwindow3.Add(this.libPathTreeView);
this.table4.Add(this.scrolledwindow3);
- Gtk.Table.TableChild w38 =
((Gtk.Table.TableChild)(this.table4[this.scrolledwindow3]));
- w38.TopAttach = ((uint)(1));
- w38.BottomAttach = ((uint)(2));
- w38.LeftAttach = ((uint)(1));
- w38.RightAttach = ((uint)(2));
+ Gtk.Table.TableChild w39 =
((Gtk.Table.TableChild)(this.table4[this.scrolledwindow3]));
+ w39.TopAttach = ((uint)(1));
+ w39.BottomAttach = ((uint)(2));
+ w39.LeftAttach = ((uint)(1));
+ w39.RightAttach = ((uint)(2));
// Container child table4.Gtk.Table+TableChild
this.vbox3 = new Gtk.VBox();
this.vbox3.Name = "vbox3";
@@ -556,10 +570,10 @@
this.libPathBrowseButton.UseUnderline = true;
this.libPathBrowseButton.Label =
Mono.Unix.Catalog.GetString("Browse...");
this.vbox3.Add(this.libPathBrowseButton);
- Gtk.Box.BoxChild w39 =
((Gtk.Box.BoxChild)(this.vbox3[this.libPathBrowseButton]));
- w39.Position = 0;
- w39.Expand = false;
- w39.Fill = false;
+ Gtk.Box.BoxChild w40 =
((Gtk.Box.BoxChild)(this.vbox3[this.libPathBrowseButton]));
+ w40.Position = 0;
+ w40.Expand = false;
+ w40.Fill = false;
// Container child vbox3.Gtk.Box+BoxChild
this.libPathRemoveButton = new Gtk.Button();
this.libPathRemoveButton.Sensitive = false;
@@ -568,20 +582,20 @@
this.libPathRemoveButton.UseUnderline = true;
this.libPathRemoveButton.Label =
Mono.Unix.Catalog.GetString("Remove");
this.vbox3.Add(this.libPathRemoveButton);
- Gtk.Box.BoxChild w40 =
((Gtk.Box.BoxChild)(this.vbox3[this.libPathRemoveButton]));
- w40.Position = 1;
- w40.Expand = false;
- w40.Fill = false;
+ Gtk.Box.BoxChild w41 =
((Gtk.Box.BoxChild)(this.vbox3[this.libPathRemoveButton]));
+ w41.Position = 1;
+ w41.Expand = false;
+ w41.Fill = false;
this.table4.Add(this.vbox3);
- Gtk.Table.TableChild w41 =
((Gtk.Table.TableChild)(this.table4[this.vbox3]));
- w41.TopAttach = ((uint)(1));
- w41.BottomAttach = ((uint)(2));
- w41.LeftAttach = ((uint)(2));
- w41.RightAttach = ((uint)(3));
- w41.XOptions = ((Gtk.AttachOptions)(4));
+ Gtk.Table.TableChild w42 =
((Gtk.Table.TableChild)(this.table4[this.vbox3]));
+ w42.TopAttach = ((uint)(1));
+ w42.BottomAttach = ((uint)(2));
+ w42.LeftAttach = ((uint)(2));
+ w42.RightAttach = ((uint)(3));
+ w42.XOptions = ((Gtk.AttachOptions)(4));
this.vbox7.Add(this.table4);
- Gtk.Box.BoxChild w42 =
((Gtk.Box.BoxChild)(this.vbox7[this.table4]));
- w42.Position = 0;
+ Gtk.Box.BoxChild w43 =
((Gtk.Box.BoxChild)(this.vbox7[this.table4]));
+ w43.Position = 0;
// Container child vbox7.Gtk.Box+BoxChild
this.table3 = new Gtk.Table(((uint)(2)), ((uint)(3)), false);
this.table3.Name = "table3";
@@ -595,11 +609,11 @@
this.includePathAddButton.UseUnderline = true;
this.includePathAddButton.Label =
Mono.Unix.Catalog.GetString("Add");
this.table3.Add(this.includePathAddButton);
- Gtk.Table.TableChild w43 =
((Gtk.Table.TableChild)(this.table3[this.includePathAddButton]));
- w43.LeftAttach = ((uint)(2));
- w43.RightAttach = ((uint)(3));
- w43.XOptions = ((Gtk.AttachOptions)(4));
- w43.YOptions = ((Gtk.AttachOptions)(4));
+ Gtk.Table.TableChild w44 =
((Gtk.Table.TableChild)(this.table3[this.includePathAddButton]));
+ w44.LeftAttach = ((uint)(2));
+ w44.RightAttach = ((uint)(3));
+ w44.XOptions = ((Gtk.AttachOptions)(4));
+ w44.YOptions = ((Gtk.AttachOptions)(4));
// Container child table3.Gtk.Table+TableChild
this.includePathEntry = new Gtk.Entry();
this.includePathEntry.CanFocus = true;
@@ -607,18 +621,18 @@
this.includePathEntry.IsEditable = true;
this.includePathEntry.InvisibleChar = '●';
this.table3.Add(this.includePathEntry);
- Gtk.Table.TableChild w44 =
((Gtk.Table.TableChild)(this.table3[this.includePathEntry]));
- w44.LeftAttach = ((uint)(1));
- w44.RightAttach = ((uint)(2));
- w44.YOptions = ((Gtk.AttachOptions)(4));
+ Gtk.Table.TableChild w45 =
((Gtk.Table.TableChild)(this.table3[this.includePathEntry]));
+ w45.LeftAttach = ((uint)(1));
+ w45.RightAttach = ((uint)(2));
+ w45.YOptions = ((Gtk.AttachOptions)(4));
// Container child table3.Gtk.Table+TableChild
this.label9 = new Gtk.Label();
this.label9.Name = "label9";
this.label9.LabelProp = Mono.Unix.Catalog.GetString("Include:");
this.table3.Add(this.label9);
- Gtk.Table.TableChild w45 =
((Gtk.Table.TableChild)(this.table3[this.label9]));
- w45.XOptions = ((Gtk.AttachOptions)(4));
- w45.YOptions = ((Gtk.AttachOptions)(4));
+ Gtk.Table.TableChild w46 =
((Gtk.Table.TableChild)(this.table3[this.label9]));
+ w46.XOptions = ((Gtk.AttachOptions)(4));
+ w46.YOptions = ((Gtk.AttachOptions)(4));
// Container child table3.Gtk.Table+TableChild
this.scrolledwindow2 = new Gtk.ScrolledWindow();
this.scrolledwindow2.CanFocus = true;
@@ -633,11 +647,11 @@
this.includePathTreeView.HeadersClickable = true;
this.scrolledwindow2.Add(this.includePathTreeView);
this.table3.Add(this.scrolledwindow2);
- Gtk.Table.TableChild w47 =
((Gtk.Table.TableChild)(this.table3[this.scrolledwindow2]));
- w47.TopAttach = ((uint)(1));
- w47.BottomAttach = ((uint)(2));
- w47.LeftAttach = ((uint)(1));
- w47.RightAttach = ((uint)(2));
+ Gtk.Table.TableChild w48 =
((Gtk.Table.TableChild)(this.table3[this.scrolledwindow2]));
+ w48.TopAttach = ((uint)(1));
+ w48.BottomAttach = ((uint)(2));
+ w48.LeftAttach = ((uint)(1));
+ w48.RightAttach = ((uint)(2));
// Container child table3.Gtk.Table+TableChild
this.vbox5 = new Gtk.VBox();
this.vbox5.Name = "vbox5";
@@ -649,10 +663,10 @@
this.includePathBrowseButton.UseUnderline = true;
this.includePathBrowseButton.Label =
Mono.Unix.Catalog.GetString("Browse...");
this.vbox5.Add(this.includePathBrowseButton);
- Gtk.Box.BoxChild w48 =
((Gtk.Box.BoxChild)(this.vbox5[this.includePathBrowseButton]));
- w48.Position = 0;
- w48.Expand = false;
- w48.Fill = false;
+ Gtk.Box.BoxChild w49 =
((Gtk.Box.BoxChild)(this.vbox5[this.includePathBrowseButton]));
+ w49.Position = 0;
+ w49.Expand = false;
+ w49.Fill = false;
// Container child vbox5.Gtk.Box+BoxChild
this.includePathRemoveButton = new Gtk.Button();
this.includePathRemoveButton.Sensitive = false;
@@ -661,24 +675,24 @@
this.includePathRemoveButton.UseUnderline = true;
this.includePathRemoveButton.Label =
Mono.Unix.Catalog.GetString("Remove");
this.vbox5.Add(this.includePathRemoveButton);
- Gtk.Box.BoxChild w49 =
((Gtk.Box.BoxChild)(this.vbox5[this.includePathRemoveButton]));
- w49.Position = 1;
- w49.Expand = false;
- w49.Fill = false;
+ Gtk.Box.BoxChild w50 =
((Gtk.Box.BoxChild)(this.vbox5[this.includePathRemoveButton]));
+ w50.Position = 1;
+ w50.Expand = false;
+ w50.Fill = false;
this.table3.Add(this.vbox5);
- Gtk.Table.TableChild w50 =
((Gtk.Table.TableChild)(this.table3[this.vbox5]));
- w50.TopAttach = ((uint)(1));
- w50.BottomAttach = ((uint)(2));
- w50.LeftAttach = ((uint)(2));
- w50.RightAttach = ((uint)(3));
- w50.XOptions = ((Gtk.AttachOptions)(4));
+ Gtk.Table.TableChild w51 =
((Gtk.Table.TableChild)(this.table3[this.vbox5]));
+ w51.TopAttach = ((uint)(1));
+ w51.BottomAttach = ((uint)(2));
+ w51.LeftAttach = ((uint)(2));
+ w51.RightAttach = ((uint)(3));
+ w51.XOptions = ((Gtk.AttachOptions)(4));
this.vbox7.Add(this.table3);
- Gtk.Box.BoxChild w51 =
((Gtk.Box.BoxChild)(this.vbox7[this.table3]));
- w51.Position = 1;
+ Gtk.Box.BoxChild w52 =
((Gtk.Box.BoxChild)(this.vbox7[this.table3]));
+ w52.Position = 1;
this.notebook1.Add(this.vbox7);
- Gtk.Notebook.NotebookChild w52 =
((Gtk.Notebook.NotebookChild)(this.notebook1[this.vbox7]));
- w52.Position = 2;
- w52.TabExpand = false;
+ Gtk.Notebook.NotebookChild w53 =
((Gtk.Notebook.NotebookChild)(this.notebook1[this.vbox7]));
+ w53.Position = 2;
+ w53.TabExpand = false;
// Notebook tab
this.label3 = new Gtk.Label();
this.label3.Name = "label3";
Modified: trunk/monodevelop/Extras/CBinding/gtk-gui/gui.stetic
===================================================================
--- trunk/monodevelop/Extras/CBinding/gtk-gui/gui.stetic 2007-10-05
20:53:20 UTC (rev 87013)
+++ trunk/monodevelop/Extras/CBinding/gtk-gui/gui.stetic 2007-10-05
21:01:15 UTC (rev 87014)
@@ -9,14 +9,9 @@
<widget-library name="../../../build/bin/MonoDevelop.Ide.dll" />
<widget-library name="../../../build/bin/MonoDevelop.Projects.Gui.dll" />
<widget-library name="../../../build/AddIns/MonoDevelop.Deployment.dll" />
- <widget-library name="../../../build/AddIns/MonoDevelop.Deployment.dll" />
- <widget-library name="../../../build/bin/MonoDevelop.Projects.Gui.dll" />
- <widget-library name="../../../build/bin/MonoDevelop.Components.dll" />
- <widget-library name="../../../build/bin/MonoDevelop.Ide.dll" />
<widget-library
name="../../../build/AddIns/MonoDevelop.Deployment.Linux.dll" />
- <widget-library
name="../../../build/AddIns/MonoDevelop.Deployment.Linux.dll" />
</import>
- <widget class="Gtk.Bin" id="CBinding.CodeGenerationPanel" design-size="578
360">
+ <widget class="Gtk.Bin" id="CBinding.CodeGenerationPanel" design-size="611
396">
<property name="MemberName" />
<child>
<widget class="Gtk.Notebook" id="notebook1">
@@ -155,7 +150,6 @@
<property name="MemberName" />
<property name="CanFocus">True</property>
<property name="Label" translatable="yes">no
warnings</property>
- <property name="Active">True</property>
<property name="DrawIndicator">True</property>
<property name="HasLabel">True</property>
<property name="UseUnderline">True</property>
@@ -202,6 +196,22 @@
<property name="Fill">False</property>
</packing>
</child>
+ <child>
+ <widget class="Gtk.CheckButton"
id="warningsAsErrorsCheckBox">
+ <property name="MemberName" />
+ <property name="CanFocus">True</property>
+ <property name="Label" translatable="yes">Treat
warnings as errors</property>
+ <property name="DrawIndicator">True</property>
+ <property name="HasLabel">True</property>
+ <property name="UseUnderline">True</property>
+ </widget>
+ <packing>
+ <property name="Position">3</property>
+ <property name="AutoSize">True</property>
+ <property name="Expand">False</property>
+ <property name="Fill">False</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="LeftAttach">1</property>
@@ -315,7 +325,7 @@
<property name="LabelProp"
translatable="yes">Extra Compiler Options</property>
</widget>
<packing>
- <property name="AutoSize">True</property>
+ <property name="AutoSize">False</property>
<property name="XOptions">Fill</property>
<property name="YOptions">Fill</property>
<property name="XExpand">False</property>
@@ -386,10 +396,11 @@
<property name="LeftAttach">1</property>
<property name="RightAttach">2</property>
<property name="AutoSize">False</property>
+ <property name="YOptions">Fill</property>
<property name="XExpand">True</property>
<property name="XFill">True</property>
<property name="XShrink">False</property>
- <property name="YExpand">True</property>
+ <property name="YExpand">False</property>
<property name="YFill">True</property>
<property name="YShrink">False</property>
</packing>
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
