diff options
| author | jpbruyere <jp.bruyere@hotmail.com> | 2016-08-10 08:57:06 +0200 |
|---|---|---|
| committer | jpbruyere <jp.bruyere@hotmail.com> | 2016-08-10 08:57:06 +0200 |
| commit | 83d939a7ed56bb72c6ef2d89111fe6875b576002 (patch) | |
| tree | e868f02e20513b378398eb9883abab4cfa81b02f | |
| parent | 1b2e2794fc8c4c8c20ff50fd7fbe842908912d23 (diff) | |
* IMLReader.cs, MessageBox.goml:
debug
* TextBox.cs:
debug
CTOR order! parameterless should be first
| -rw-r--r-- | Templates/MessageBox.goml | 2 | ||||
| -rw-r--r-- | src/GraphicObjects/TextBox.cs | 5 | ||||
| -rw-r--r-- | src/IMLReader.cs | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/Templates/MessageBox.goml b/Templates/MessageBox.goml index 4489ee6b..2468b7fc 100644 --- a/Templates/MessageBox.goml +++ b/Templates/MessageBox.goml @@ -22,7 +22,7 @@ Path="#Crow.Images.Icons.iconInfo.svg" /> <Label Font="serif, 12" Height="{./HeightPolicy}" Width="{./WidthPolicy}" Text="{./Message}" TextAlignment="Left" - Multiline="true" WordWrap="true"/> + Multiline="true" /> </HorizontalStack> <HorizontalStack Height="-1" Width="{./WidthPolicy}" Margin="3"> <GraphicObject Height="5"/> diff --git a/src/GraphicObjects/TextBox.cs b/src/GraphicObjects/TextBox.cs index 5c3772b7..81fce3e2 100644 --- a/src/GraphicObjects/TextBox.cs +++ b/src/GraphicObjects/TextBox.cs @@ -29,14 +29,13 @@ namespace Crow public class TextBox : Label { #region CTOR + public TextBox() + { } public TextBox(string _initialValue) : base(_initialValue) { } - - public TextBox() - { } #endregion #region GraphicObject overrides diff --git a/src/IMLReader.cs b/src/IMLReader.cs index 7792de4d..1b2a5efb 100644 --- a/src/IMLReader.cs +++ b/src/IMLReader.cs @@ -133,7 +133,7 @@ namespace Crow else if (reader.Name == "Path") path = reader.Value; } - + reader.MoveToElement (); using (IMLReader iTmp = new IMLReader (null, reader.ReadInnerXml ())) { string uid = Guid.NewGuid ().ToString (); Interface.Instantiators [uid] = @@ -275,7 +275,7 @@ namespace Crow if (t == null) throw new Exception (reader.Name + " type not found"); - reader.il.Emit(OpCodes.Newobj, t.GetConstructors () [0]); + reader.il.Emit(OpCodes.Newobj, t.GetConstructors () [0]);//TODO:search parameterless ctor reader.il.Emit (OpCodes.Stloc_0);//child is now loc_0 reader.emitLoader(t); |