diff options
| author | jpbruyere <jp.bruyere@hotmail.com> | 2015-09-09 13:50:40 +0200 |
|---|---|---|
| committer | jpbruyere <jp.bruyere@hotmail.com> | 2015-09-09 13:50:40 +0200 |
| commit | 0c200d4ae4f0f4a7a7c58c3affc7670eb6b2dcff (patch) | |
| tree | a0650162842e5e9089d146ab20d555865b6a3011 /Tests | |
| parent | ea0ee8408e82a19c00637aaa054165bbb49805ba (diff) | |
simplify Loading, removed unnecessary overloads
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/GOLIBTest_0.cs | 4 | ||||
| -rw-r--r-- | Tests/GOLIBTest_4.cs | 4 | ||||
| -rw-r--r-- | Tests/GOLIBTest_5.cs | 4 | ||||
| -rw-r--r-- | Tests/GOLIBTest_Listbox.cs | 9 |
4 files changed, 7 insertions, 14 deletions
diff --git a/Tests/GOLIBTest_0.cs b/Tests/GOLIBTest_0.cs index 88cd45e9..a41cdb41 100644 --- a/Tests/GOLIBTest_0.cs +++ b/Tests/GOLIBTest_0.cs @@ -22,13 +22,13 @@ namespace test6 : base(1024, 600,"test")
{}
- Border g;
+ GraphicObject g;
Label l;
protected override void OnLoad (EventArgs e)
{
base.OnLoad (e);
- LoadInterface("Interfaces/test0.goml", out g);
+ g = LoadInterface("Interfaces/test0.goml");
l = g.FindByName ("labCpt") as Label;
}
diff --git a/Tests/GOLIBTest_4.cs b/Tests/GOLIBTest_4.cs index 8adb5064..c1f2e0ad 100644 --- a/Tests/GOLIBTest_4.cs +++ b/Tests/GOLIBTest_4.cs @@ -66,7 +66,7 @@ namespace test }
#endregion
- Group c,c2;
+ GraphicObject c;
ProgressBar pb, pb2;
Label labMousePos, labPb, labF, labA, labH, labFps, labFpsMin, labFpsMax, labV,
labUpdate;
@@ -83,7 +83,7 @@ namespace test {
base.OnLoad (e);
- LoadInterface("Interfaces/test4.goml", out c);
+ c = LoadInterface("Interfaces/test4.goml");
//LoadInterface("golibtests/test4.xml", out c2);
//c2.HorizontalAlignment = HorizontalAlignment.Left;
//c2.VerticalAlignment = VerticalAlignment.Top;
diff --git a/Tests/GOLIBTest_5.cs b/Tests/GOLIBTest_5.cs index 1969bcf1..d5a8a343 100644 --- a/Tests/GOLIBTest_5.cs +++ b/Tests/GOLIBTest_5.cs @@ -20,14 +20,14 @@ namespace test : base(1024, 600,"test5")
{}
- Container c;
+ GraphicObject c;
List<GraphicObject> gl = new List<GraphicObject>();
List<Label> ll = new List<Label>();
protected override void OnLoad (EventArgs e)
{
base.OnLoad (e);
- LoadInterface("Interfaces/test5.goml", out c);
+ c = LoadInterface("Interfaces/test5.goml");
gl.Add (c.FindByName ("g0"));
ll.Add (c.FindByName ("lab0")as Label);
}
diff --git a/Tests/GOLIBTest_Listbox.cs b/Tests/GOLIBTest_Listbox.cs index 815acfd2..f3064dd1 100644 --- a/Tests/GOLIBTest_Listbox.cs +++ b/Tests/GOLIBTest_Listbox.cs @@ -80,24 +80,17 @@ namespace test // "string 2",
// "string 3"
// };
- ListBox g;
protected override void OnLoad (EventArgs e)
{
base.OnLoad (e);
- LoadInterface("Interfaces/test_Listbox.goml", out g);
+ LoadInterface("Interfaces/test_Listbox.goml");
// TestList [1].Field = "test string";
// ValueChanged.Raise(this, new ValueChangeEventArgs ("TestList", null, TestList));
}
- protected override void OnRenderFrame (FrameEventArgs e)
- {
- GL.Clear (ClearBufferMask.ColorBufferBit);
- base.OnRenderFrame (e);
- SwapBuffers ();
- }
protected override void OnUpdateFrame (FrameEventArgs e)
{
|