Author: lluis
Date: 2007-05-15 10:26:20 -0400 (Tue, 15 May 2007)
New Revision: 77412
Modified:
trunk/monodevelop/Extras/CSharpBinding/CSharpBinding.mds
trunk/monodevelop/Extras/CSharpBinding/ChangeLog
trunk/monodevelop/Extras/CSharpBinding/Parser/Resolver.cs
trunk/monodevelop/Extras/CSharpBinding/gtk-gui/gui.stetic
Log:
* Parser/Resolver.cs: Include const fields in the static field list.
Fixes bug #81078.
* CSharpBinding.mds, gtk-gui/gui.stetic: Updated.
Modified: trunk/monodevelop/Extras/CSharpBinding/CSharpBinding.mds
===================================================================
--- trunk/monodevelop/Extras/CSharpBinding/CSharpBinding.mds 2007-05-15
14:16:48 UTC (rev 77411)
+++ trunk/monodevelop/Extras/CSharpBinding/CSharpBinding.mds 2007-05-15
14:26:20 UTC (rev 77412)
@@ -1,5 +1,5 @@
<Combine name="CSharpBinding" fileversion="2.0">
- <Configurations active="Debug">
+ <Configurations>
<Configuration name="Debug" ctype="CombineConfiguration">
<Entry build="True" name="CSharpBinding" configuration="Debug" />
<Entry build="True" name="CSharpBinding.Autotools" configuration="Debug"
/>
Modified: trunk/monodevelop/Extras/CSharpBinding/ChangeLog
===================================================================
--- trunk/monodevelop/Extras/CSharpBinding/ChangeLog 2007-05-15 14:16:48 UTC
(rev 77411)
+++ trunk/monodevelop/Extras/CSharpBinding/ChangeLog 2007-05-15 14:26:20 UTC
(rev 77412)
@@ -1,3 +1,9 @@
+2007-05-15 Lluis Sanchez Gual <[EMAIL PROTECTED]>
+
+ * Parser/Resolver.cs: Include const fields in the static field list.
+ Fixes bug #81078.
+ * CSharpBinding.mds, gtk-gui/gui.stetic: Updated.
+
2007-05-14 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* Gui/CSharpTextEditorExtension.cs: (GetPreviousToken): Return tokens
Modified: trunk/monodevelop/Extras/CSharpBinding/Parser/Resolver.cs
===================================================================
--- trunk/monodevelop/Extras/CSharpBinding/Parser/Resolver.cs 2007-05-15
14:16:48 UTC (rev 77411)
+++ trunk/monodevelop/Extras/CSharpBinding/Parser/Resolver.cs 2007-05-15
14:26:20 UTC (rev 77412)
@@ -408,8 +408,8 @@
{
if (c.ClassType == ClassType.Enum && (member is IField))
return showStatic;
- if ((!showStatic && member.IsStatic) ||
- (showStatic && !member.IsStatic) ||
+ bool memStatic = member.IsStatic || ((member is IField)
&& member.IsLiteral);
+ if ((showStatic != memStatic) ||
(showStatic && member.IsStatic &&
member.IsSpecialName && member.Name.StartsWith ("op_"))
) {
//// enum type fields are not shown here -
there is no info in member about enum field
Modified: trunk/monodevelop/Extras/CSharpBinding/gtk-gui/gui.stetic
===================================================================
--- trunk/monodevelop/Extras/CSharpBinding/gtk-gui/gui.stetic 2007-05-15
14:16:48 UTC (rev 77411)
+++ trunk/monodevelop/Extras/CSharpBinding/gtk-gui/gui.stetic 2007-05-15
14:26:20 UTC (rev 77412)
@@ -1,21 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<stetic-interface>
<import>
+ <widget-library name="../../../build/AddIns/MonoDevelop.Ide.dll" />
<widget-library name="../../../build/AddIns/MonoDevelop.Components.dll" />
<widget-library name="../../../build/AddIns/MonoDevelop.Projects.Gui.dll"
/>
</import>
<widget class="Gtk.Bin" id="CSharpBinding.CodeGenerationPanelWidget"
design-size="356 416">
<property name="MemberName" />
- <property name="Events">0</property>
<child>
<widget class="Gtk.VBox" id="vbox62">
<property name="MemberName" />
- <property name="Events">0</property>
<property name="Spacing">12</property>
<child>
<widget class="Gtk.Label" id="label82">
<property name="MemberName" />
- <property name="Events">0</property>
<property name="Xalign">0</property>
<property name="LabelProp" translatable="yes"><b>Code
Generation</b></property>
<property name="UseMarkup">True</property>
@@ -30,12 +28,10 @@
<child>
<widget class="Gtk.HBox" id="hbox56">
<property name="MemberName" />
- <property name="Events">0</property>
<child>
<widget class="Gtk.Label" id="label81">
<property name="MemberName" />
<property name="WidthRequest">18</property>
- <property name="Events">0</property>
<property name="LabelProp" translatable="yes" />
</widget>
<packing>
@@ -48,12 +44,10 @@
<child>
<widget class="Gtk.VBox" id="vbox65">
<property name="MemberName" />
- <property name="Events">0</property>
<property name="Spacing">6</property>
<child>
<widget class="Gtk.Table" id="table7">
<property name="MemberName" />
- <property name="Events">0</property>
<property name="NRows">5</property>
<property name="NColumns">2</property>
<property name="RowSpacing">6</property>
@@ -61,11 +55,9 @@
<child>
<widget class="Gtk.HBox" id="hbox1">
<property name="MemberName" />
- <property name="Events">0</property>
<child>
<widget class="Gtk.ComboBoxEntry" id="codepageEntry">
<property name="MemberName" />
- <property name="Events">0</property>
<property name="IsTextCombo">True</property>
<property name="Items" />
</widget>
@@ -96,11 +88,9 @@
<child>
<widget class="Gtk.HBox" id="hbox57">
<property name="MemberName" />
- <property name="Events">0</property>
<child>
<widget class="Gtk.ComboBox" id="compileTargetCombo">
<property name="MemberName" />
- <property name="Events">0</property>
<property name="IsTextCombo">False</property>
<property name="Items" />
</widget>
@@ -129,7 +119,6 @@
<child>
<widget class="MonoDevelop.Components.FileEntry"
id="iconEntry">
<property name="MemberName" />
- <property name="Events">0</property>
</widget>
<packing>
<property name="TopAttach">4</property>
@@ -150,7 +139,6 @@
<child>
<widget class="Gtk.Label" id="label1">
<property name="MemberName" />
- <property name="Events">0</property>
<property name="Xalign">0</property>
<property name="LabelProp" translatable="yes">Compiler
Code Page:</property>
</widget>
@@ -171,7 +159,6 @@
<child>
<widget class="Gtk.Label" id="label2">
<property name="MemberName" />
- <property name="Events">0</property>
<property name="Xalign">0</property>
<property name="LabelProp" translatable="yes">Win32
Icon:</property>
</widget>
@@ -192,7 +179,6 @@
<child>
<widget class="Gtk.Label" id="label86">
<property name="MemberName" />
- <property name="Events">0</property>
<property name="Xalign">0</property>
<property name="LabelProp" translatable="yes">Compile
_Target:</property>
<property name="UseUnderline">True</property>
@@ -212,7 +198,6 @@
<child>
<widget class="Gtk.Label" id="label87">
<property name="MemberName" />
- <property name="Events">0</property>
<property name="Xalign">0</property>
<property name="LabelProp" translatable="yes">Define
S_ymbols:</property>
<property name="UseUnderline">True</property>
@@ -235,7 +220,6 @@
<child>
<widget class="Gtk.Label" id="label88">
<property name="MemberName" />
- <property name="Events">0</property>
<property name="Xalign">0</property>
<property name="LabelProp" translatable="yes">_Main
Class:</property>
<property name="UseUnderline">True</property>
@@ -258,7 +242,6 @@
<child>
<widget class="Gtk.ComboBoxEntry" id="mainClassEntry">
<property name="MemberName" />
- <property name="Events">0</property>
<property name="IsTextCombo">False</property>
<property name="Items" />
</widget>
@@ -282,7 +265,6 @@
<widget class="Gtk.Entry" id="symbolsEntry">
<property name="MemberName" />
<property name="CanFocus">True</property>
- <property name="Events">0</property>
<property name="IsEditable">True</property>
<property name="InvisibleChar">●</property>
</widget>
@@ -324,7 +306,6 @@
<child>
<widget class="Gtk.Label" id="label90">
<property name="MemberName" />
- <property name="Events">0</property>
<property name="Xalign">0</property>
<property name="LabelProp"
translatable="yes"><b>Warnings</b></property>
<property name="UseMarkup">True</property>
@@ -340,12 +321,10 @@
<child>
<widget class="Gtk.HBox" id="hbox47">
<property name="MemberName" />
- <property name="Events">0</property>
<child>
<widget class="Gtk.Label" id="label72">
<property name="MemberName" />
<property name="WidthRequest">18</property>
- <property name="Events">0</property>
<property name="LabelProp" translatable="yes" />
</widget>
<packing>
@@ -358,17 +337,14 @@
<child>
<widget class="Gtk.VBox" id="vbox64">
<property name="MemberName" />
- <property name="Events">0</property>
<property name="Spacing">6</property>
<child>
<widget class="Gtk.HBox" id="hbox55">
<property name="MemberName" />
- <property name="Events">0</property>
<property name="Spacing">6</property>
<child>
<widget class="Gtk.Label" id="label80">
<property name="MemberName" />
- <property name="Events">0</property>
<property name="LabelProp" translatable="yes">_Warning
Level:</property>
<property name="UseUnderline">True</property>
<property
name="MnemonicWidget">warningLevelSpinButton</property>
@@ -384,7 +360,6 @@
<widget class="Gtk.SpinButton"
id="warningLevelSpinButton">
<property name="MemberName" />
<property name="CanFocus">True</property>
- <property name="Events">0</property>
<property name="Upper">4</property>
<property name="PageIncrement">1</property>
<property name="PageSize">1</property>
@@ -412,7 +387,6 @@
<widget class="Gtk.CheckButton"
id="generateOverflowChecksCheckButton">
<property name="MemberName" />
<property name="CanFocus">True</property>
- <property name="Events">0</property>
<property name="Label" translatable="yes">_Generate
overflow checks</property>
<property name="DrawIndicator">True</property>
<property name="HasLabel">True</property>
@@ -429,7 +403,6 @@
<widget class="Gtk.CheckButton"
id="allowUnsafeCodeCheckButton">
<property name="MemberName" />
<property name="CanFocus">True</property>
- <property name="Events">0</property>
<property name="Label" translatable="yes">Allow '_unsafe'
code</property>
<property name="DrawIndicator">True</property>
<property name="HasLabel">True</property>
@@ -446,7 +419,6 @@
<widget class="Gtk.CheckButton"
id="enableOptimizationCheckButton">
<property name="MemberName" />
<property name="CanFocus">True</property>
- <property name="Events">0</property>
<property name="Label" translatable="yes">Enable
_optimizations</property>
<property name="DrawIndicator">True</property>
<property name="HasLabel">True</property>
@@ -463,7 +435,6 @@
<widget class="Gtk.CheckButton"
id="warningsAsErrorsCheckButton">
<property name="MemberName" />
<property name="CanFocus">True</property>
- <property name="Events">0</property>
<property name="Label" translatable="yes">Treat warnings
as _errors</property>
<property name="DrawIndicator">True</property>
<property name="HasLabel">True</property>
@@ -480,7 +451,6 @@
<widget class="Gtk.CheckButton"
id="generateDebugInformationCheckButton">
<property name="MemberName" />
<property name="CanFocus">True</property>
- <property name="Events">0</property>
<property name="Label" translatable="yes">Emit _debugging
information</property>
<property name="DrawIndicator">True</property>
<property name="HasLabel">True</property>
@@ -497,7 +467,6 @@
<widget class="Gtk.CheckButton"
id="generateXmlOutputCheckButton">
<property name="MemberName" />
<property name="CanFocus">True</property>
- <property name="Events">0</property>
<property name="Label" translatable="yes">Generate _xml
documentation</property>
<property name="DrawIndicator">True</property>
<property name="HasLabel">True</property>
@@ -527,16 +496,13 @@
</widget>
<widget class="Gtk.Bin" id="CSharpBinding.FormattingPanelWidget"
design-size="320 240">
<property name="MemberName" />
- <property name="Events">0</property>
<child>
<widget class="Gtk.VBox" id="container">
<property name="MemberName" />
- <property name="Events">0</property>
<property name="Spacing">12</property>
<child>
<widget class="Gtk.Label" id="Indentation">
<property name="MemberName" />
- <property name="Events">0</property>
<property name="Xalign">0</property>
<property name="LabelProp"
translatable="yes"><b>Indentation</b></property>
<property name="UseMarkup">True</property>
@@ -551,12 +517,10 @@
<child>
<widget class="Gtk.HBox" id="hboxIndentation">
<property name="MemberName" />
- <property name="Events">0</property>
<child>
<widget class="Gtk.Label" id="indentationSpacer">
<property name="MemberName" />
<property name="WidthRequest">18</property>
- <property name="Events">0</property>
<property name="LabelProp" translatable="yes" />
</widget>
<packing>
@@ -569,13 +533,11 @@
<child>
<widget class="Gtk.VBox" id="vboxIndentation">
<property name="MemberName" />
- <property name="Events">0</property>
<property name="Spacing">6</property>
<child>
<widget class="Gtk.CheckButton" id="indentCaseLabels">
<property name="MemberName" />
<property name="CanFocus">True</property>
- <property name="Events">0</property>
<property name="Label" translatable="yes">Indent case
labels</property>
<property name="DrawIndicator">True</property>
<property name="HasLabel">True</property>
@@ -607,7 +569,6 @@
<child>
<widget class="Gtk.Label" id="LabelIndentation">
<property name="MemberName" />
- <property name="Events">0</property>
<property name="Xalign">0</property>
<property name="LabelProp" translatable="yes"><b>Label
Indentation</b></property>
<property name="UseMarkup">True</property>
@@ -622,12 +583,10 @@
<child>
<widget class="Gtk.HBox" id="hboxLabelIndentation">
<property name="MemberName" />
- <property name="Events">0</property>
<child>
<widget class="Gtk.Label" id="labelIndentationSpacer">
<property name="MemberName" />
<property name="WidthRequest">18</property>
- <property name="Events">0</property>
<property name="LabelProp" translatable="yes" />
</widget>
<packing>
@@ -640,13 +599,11 @@
<child>
<widget class="Gtk.VBox" id="vboxLabelIndentation">
<property name="MemberName" />
- <property name="Events">0</property>
<property name="Spacing">6</property>
<child>
<widget class="Gtk.RadioButton"
id="indentGotoLabelsLeftJustify">
<property name="MemberName" />
<property name="CanFocus">True</property>
- <property name="Events">0</property>
<property name="Label" translatable="yes">Place goto
labels in leftmost column</property>
<property name="Active">True</property>
<property name="DrawIndicator">True</property>
@@ -665,7 +622,6 @@
<widget class="Gtk.RadioButton"
id="indentGotoLabelsUpOneLevel">
<property name="MemberName" />
<property name="CanFocus">True</property>
- <property name="Events">0</property>
<property name="Label" translatable="yes">Place goto
labels one indent less than current</property>
<property name="DrawIndicator">True</property>
<property name="HasLabel">True</property>
@@ -683,7 +639,6 @@
<widget class="Gtk.RadioButton"
id="indentGotoLabelsNormally">
<property name="MemberName" />
<property name="CanFocus">True</property>
- <property name="Events">0</property>
<property name="Label" translatable="yes">Indent goto
labels normally</property>
<property name="DrawIndicator">True</property>
<property name="HasLabel">True</property>
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
