diff options
| author | Jean-Philippe Bruyère <jp_bruyere@hotmail.com> | 2017-02-16 15:13:53 +0100 |
|---|---|---|
| committer | Jean-Philippe Bruyère <jp_bruyere@hotmail.com> | 2017-02-16 15:13:53 +0100 |
| commit | d28bdf7a0f3d6021c7af966c7ddcedc19e719c60 (patch) | |
| tree | a622080929c17701431e428dfff46b7badbfe2bd | |
| parent | 35555b7988e10acbed258725dcb1021061f74784 (diff) | |
rename out of crow perif event handler funcs
| -rw-r--r-- | Tests/CrowWindow.cs | 16 | ||||
| -rw-r--r-- | src/GraphicObjects/TemplatedGroup.cs | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/Tests/CrowWindow.cs b/Tests/CrowWindow.cs index 997ef002..09662b07 100644 --- a/Tests/CrowWindow.cs +++ b/Tests/CrowWindow.cs @@ -221,10 +221,10 @@ namespace Crow this.KeyPress += new EventHandler<OpenTK.KeyPressEventArgs>(OpenTKGameWindow_KeyPress); Keyboard.KeyDown += new EventHandler<OpenTK.Input.KeyboardKeyEventArgs>(Keyboard_KeyDown); Keyboard.KeyUp += new EventHandler<OpenTK.Input.KeyboardKeyEventArgs>(Keyboard_KeyUp); - Mouse.WheelChanged += new EventHandler<OpenTK.Input.MouseWheelEventArgs>(Mouse_WheelChanged); - Mouse.ButtonDown += new EventHandler<OpenTK.Input.MouseButtonEventArgs>(Mouse_ButtonDown); - Mouse.ButtonUp += new EventHandler<OpenTK.Input.MouseButtonEventArgs>(Mouse_ButtonUp); - Mouse.Move += new EventHandler<OpenTK.Input.MouseMoveEventArgs>(Mouse_Move); + Mouse.WheelChanged += new EventHandler<OpenTK.Input.MouseWheelEventArgs>(GL_Mouse_WheelChanged); + Mouse.ButtonDown += new EventHandler<OpenTK.Input.MouseButtonEventArgs>(GL_Mouse_ButtonDown); + Mouse.ButtonUp += new EventHandler<OpenTK.Input.MouseButtonEventArgs>(GL_Mouse_ButtonUp); + Mouse.Move += new EventHandler<OpenTK.Input.MouseMoveEventArgs>(GL_Mouse_Move); #if DEBUG Console.WriteLine("\n\n*************************************"); @@ -291,7 +291,7 @@ namespace Crow e.EnableBit (i); } } - protected virtual void Mouse_Move(object sender, OpenTK.Input.MouseMoveEventArgs otk_e) + protected virtual void GL_Mouse_Move(object sender, OpenTK.Input.MouseMoveEventArgs otk_e) { if (activeIdx == -2) { focusedIdx = -1; @@ -308,7 +308,7 @@ namespace Crow if (focusedIdx < 0) MouseMove.Raise (sender, otk_e); } - protected virtual void Mouse_ButtonUp(object sender, OpenTK.Input.MouseButtonEventArgs otk_e) + protected virtual void GL_Mouse_ButtonUp(object sender, OpenTK.Input.MouseButtonEventArgs otk_e) { activeIdx = -2; if (focusedIdx >= 0) { @@ -317,7 +317,7 @@ namespace Crow } MouseButtonUp.Raise (sender, otk_e); } - protected virtual void Mouse_ButtonDown(object sender, OpenTK.Input.MouseButtonEventArgs otk_e) + protected virtual void GL_Mouse_ButtonDown(object sender, OpenTK.Input.MouseButtonEventArgs otk_e) { activeIdx = focusedIdx; if (focusedIdx >= 0) { @@ -326,7 +326,7 @@ namespace Crow } MouseButtonDown.Raise (sender, otk_e); } - protected virtual void Mouse_WheelChanged(object sender, OpenTK.Input.MouseWheelEventArgs otk_e) + protected virtual void GL_Mouse_WheelChanged(object sender, OpenTK.Input.MouseWheelEventArgs otk_e) { if (focusedIdx >= 0) { if (ifaceControl [focusedIdx].ProcessMouseWheelChanged (otk_e.DeltaPrecise)) diff --git a/src/GraphicObjects/TemplatedGroup.cs b/src/GraphicObjects/TemplatedGroup.cs index dbc7876c..11ff7df5 100644 --- a/src/GraphicObjects/TemplatedGroup.cs +++ b/src/GraphicObjects/TemplatedGroup.cs @@ -171,7 +171,7 @@ namespace Crow } } - [XmlAttributeAttribute][DefaultValue("SteelBlue")]//DeepJungleGreen + [XmlAttributeAttribute][DefaultValue("SteelBlue")] public virtual Color SelectionBackground { get { return selBackground; } set { |