From 03b253c21bb27abb931ec32bd1e4126907e910ca Mon Sep 17 00:00:00 2001 From: gered Date: Fri, 29 Mar 2013 19:01:19 -0400 Subject: [PATCH] comment out System.Drawing "using" statements --- Gwen/Control/Base.cs | 2 +- Gwen/Control/Canvas.cs | 2 +- Gwen/Control/ColorLerpBox.cs | 2 +- Gwen/Control/ColorPicker.cs | 2 +- Gwen/Control/ColorSlider.cs | 2 +- Gwen/Control/ComboBox.cs | 2 +- Gwen/Control/DockBase.cs | 2 +- Gwen/Control/GroupBox.cs | 2 +- Gwen/Control/HSVColorPicker.cs | 2 +- Gwen/Control/HorizontalScrollBar.cs | 2 +- Gwen/Control/HorizontalSlider.cs | 2 +- Gwen/Control/IColorPicker.cs | 2 +- Gwen/Control/ImagePanel.cs | 2 +- Gwen/Control/Label.cs | 2 +- Gwen/Control/Layout/TableRow.cs | 2 +- Gwen/Control/ListBox.cs | 2 +- Gwen/Control/ListBoxRow.cs | 2 +- Gwen/Control/Menu.cs | 2 +- Gwen/Control/MenuItem.cs | 2 +- Gwen/Control/Property/Color.cs | 6 +++--- Gwen/Control/ResizableControl.cs | 2 +- Gwen/Control/RichLabel.cs | 2 +- Gwen/Control/ScrollControl.cs | 2 +- Gwen/Control/Slider.cs | 2 +- Gwen/Control/TabControl.cs | 2 +- Gwen/Control/TabStrip.cs | 2 +- Gwen/Control/TextBox.cs | 2 +- Gwen/Control/TreeControl.cs | 2 +- Gwen/Control/VerticalScrollBar.cs | 2 +- Gwen/Control/VerticalSlider.cs | 2 +- Gwen/Control/WindowControl.cs | 2 +- Gwen/ControlInternal/ColorButton.cs | 2 +- Gwen/ControlInternal/ColorDisplay.cs | 2 +- Gwen/ControlInternal/Dragger.cs | 2 +- Gwen/ControlInternal/Resizer.cs | 2 +- Gwen/ControlInternal/Text.cs | 2 +- Gwen/DragDrop/DragAndDrop.cs | 2 +- Gwen/DragDrop/Package.cs | 2 +- Gwen/Gwen.csproj | 4 +++- Gwen/Input/InputHandler.cs | 2 +- Gwen/Renderer/Base.cs | 2 +- Gwen/Skin/Base.cs | 2 +- Gwen/Skin/Simple.cs | 2 +- Gwen/Skin/SkinColors.cs | 2 +- Gwen/Skin/TexturedBase.cs | 2 +- Gwen/Skin/Texturing/Bordered.cs | 2 +- Gwen/Skin/Texturing/Single.cs | 2 +- Gwen/ToolTip.cs | 2 +- Gwen/Util.cs | 2 +- 49 files changed, 53 insertions(+), 51 deletions(-) diff --git a/Gwen/Control/Base.cs b/Gwen/Control/Base.cs index 84901b0..8340c82 100644 --- a/Gwen/Control/Base.cs +++ b/Gwen/Control/Base.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; -using System.Drawing; +////using System.Drawing; //using System.Windows.Forms; using Gwen.Anim; using Gwen.DragDrop; diff --git a/Gwen/Control/Canvas.cs b/Gwen/Control/Canvas.cs index d36200f..7e41fa1 100644 --- a/Gwen/Control/Canvas.cs +++ b/Gwen/Control/Canvas.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Drawing; +//using System.Drawing; using Gwen.Anim; using Gwen.DragDrop; using Gwen.Input; diff --git a/Gwen/Control/ColorLerpBox.cs b/Gwen/Control/ColorLerpBox.cs index 3014c4f..5ed3aa0 100644 --- a/Gwen/Control/ColorLerpBox.cs +++ b/Gwen/Control/ColorLerpBox.cs @@ -1,5 +1,5 @@ using System; -using System.Drawing; +//using System.Drawing; using Gwen.Input; namespace Gwen.Control diff --git a/Gwen/Control/ColorPicker.cs b/Gwen/Control/ColorPicker.cs index 5683777..36a75df 100644 --- a/Gwen/Control/ColorPicker.cs +++ b/Gwen/Control/ColorPicker.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Drawing; +//using System.Drawing; using Gwen.ControlInternal; namespace Gwen.Control diff --git a/Gwen/Control/ColorSlider.cs b/Gwen/Control/ColorSlider.cs index eb89c5e..75a0f00 100644 --- a/Gwen/Control/ColorSlider.cs +++ b/Gwen/Control/ColorSlider.cs @@ -1,5 +1,5 @@ using System; -using System.Drawing; +//using System.Drawing; using Gwen.Input; namespace Gwen.Control diff --git a/Gwen/Control/ComboBox.cs b/Gwen/Control/ComboBox.cs index 2e18a4f..4b45080 100644 --- a/Gwen/Control/ComboBox.cs +++ b/Gwen/Control/ComboBox.cs @@ -1,5 +1,5 @@ using System; -using System.Drawing; +//using System.Drawing; using Gwen.ControlInternal; namespace Gwen.Control diff --git a/Gwen/Control/DockBase.cs b/Gwen/Control/DockBase.cs index 8f6ee0c..a96fc17 100644 --- a/Gwen/Control/DockBase.cs +++ b/Gwen/Control/DockBase.cs @@ -1,5 +1,5 @@ using System; -using System.Drawing; +//using System.Drawing; using Gwen.ControlInternal; using Gwen.DragDrop; diff --git a/Gwen/Control/GroupBox.cs b/Gwen/Control/GroupBox.cs index d5624cc..614096b 100644 --- a/Gwen/Control/GroupBox.cs +++ b/Gwen/Control/GroupBox.cs @@ -1,5 +1,5 @@ using System; -using System.Drawing; +//using System.Drawing; namespace Gwen.Control { diff --git a/Gwen/Control/HSVColorPicker.cs b/Gwen/Control/HSVColorPicker.cs index 27bddbd..4bd43b0 100644 --- a/Gwen/Control/HSVColorPicker.cs +++ b/Gwen/Control/HSVColorPicker.cs @@ -1,5 +1,5 @@ using System; -using System.Drawing; +//using System.Drawing; using Gwen.ControlInternal; namespace Gwen.Control diff --git a/Gwen/Control/HorizontalScrollBar.cs b/Gwen/Control/HorizontalScrollBar.cs index 5efae7b..3d64123 100644 --- a/Gwen/Control/HorizontalScrollBar.cs +++ b/Gwen/Control/HorizontalScrollBar.cs @@ -1,5 +1,5 @@ using System; -using System.Drawing; +//using System.Drawing; using Gwen.Input; namespace Gwen.Control diff --git a/Gwen/Control/HorizontalSlider.cs b/Gwen/Control/HorizontalSlider.cs index c945e54..2a2ceb3 100644 --- a/Gwen/Control/HorizontalSlider.cs +++ b/Gwen/Control/HorizontalSlider.cs @@ -1,5 +1,5 @@ using System; -using System.Drawing; +//using System.Drawing; namespace Gwen.Control { diff --git a/Gwen/Control/IColorPicker.cs b/Gwen/Control/IColorPicker.cs index 70916eb..06d9bc4 100644 --- a/Gwen/Control/IColorPicker.cs +++ b/Gwen/Control/IColorPicker.cs @@ -1,5 +1,5 @@ using System; -using System.Drawing; +//using System.Drawing; namespace Gwen.Control { diff --git a/Gwen/Control/ImagePanel.cs b/Gwen/Control/ImagePanel.cs index f2885e3..f3a2977 100644 --- a/Gwen/Control/ImagePanel.cs +++ b/Gwen/Control/ImagePanel.cs @@ -1,5 +1,5 @@ using System; -using System.Drawing; +//using System.Drawing; namespace Gwen.Control { diff --git a/Gwen/Control/Label.cs b/Gwen/Control/Label.cs index 4c106e9..678ae32 100644 --- a/Gwen/Control/Label.cs +++ b/Gwen/Control/Label.cs @@ -1,5 +1,5 @@ using System; -using System.Drawing; +//using System.Drawing; using Gwen.ControlInternal; namespace Gwen.Control diff --git a/Gwen/Control/Layout/TableRow.cs b/Gwen/Control/Layout/TableRow.cs index 9348b26..3715380 100644 --- a/Gwen/Control/Layout/TableRow.cs +++ b/Gwen/Control/Layout/TableRow.cs @@ -1,5 +1,5 @@ using System; -using System.Drawing; +//using System.Drawing; namespace Gwen.Control.Layout { diff --git a/Gwen/Control/ListBox.cs b/Gwen/Control/ListBox.cs index e6159ec..671e0dc 100644 --- a/Gwen/Control/ListBox.cs +++ b/Gwen/Control/ListBox.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Drawing; +//using System.Drawing; using System.Linq; using System.Text.RegularExpressions; using Gwen.Control.Layout; diff --git a/Gwen/Control/ListBoxRow.cs b/Gwen/Control/ListBoxRow.cs index 159f3e9..5d1887d 100644 --- a/Gwen/Control/ListBoxRow.cs +++ b/Gwen/Control/ListBoxRow.cs @@ -1,5 +1,5 @@ using System; -using System.Drawing; +//using System.Drawing; using Gwen.Control.Layout; namespace Gwen.Control diff --git a/Gwen/Control/Menu.cs b/Gwen/Control/Menu.cs index 2b78723..01e976d 100644 --- a/Gwen/Control/Menu.cs +++ b/Gwen/Control/Menu.cs @@ -1,5 +1,5 @@ using System; -using System.Drawing; +//using System.Drawing; using System.Linq; using Gwen.ControlInternal; diff --git a/Gwen/Control/MenuItem.cs b/Gwen/Control/MenuItem.cs index 0dd26ce..9333cbd 100644 --- a/Gwen/Control/MenuItem.cs +++ b/Gwen/Control/MenuItem.cs @@ -1,5 +1,5 @@ using System; -using System.Drawing; +//using System.Drawing; using Gwen.ControlInternal; namespace Gwen.Control diff --git a/Gwen/Control/Property/Color.cs b/Gwen/Control/Property/Color.cs index 42d8421..7bec1eb 100644 --- a/Gwen/Control/Property/Color.cs +++ b/Gwen/Control/Property/Color.cs @@ -85,12 +85,12 @@ namespace Gwen.Control.Property get { return m_TextBox == InputHandler.KeyboardFocus; } } - private void SetTextFromColor(System.Drawing.Color color) + private void SetTextFromColor(Gwen.Color color) { m_TextBox.Text = String.Format("{0} {1} {2}", color.R, color.G, color.B); } - private System.Drawing.Color GetColorFromText() + private Gwen.Color GetColorFromText() { String[] split = m_TextBox.Text.Split(' '); @@ -114,7 +114,7 @@ namespace Gwen.Control.Property Byte.TryParse(split[2], out blue); } - return System.Drawing.Color.FromArgb(alpha, red, green, blue); + return Gwen.Color.FromArgb(alpha, red, green, blue); } protected override void DoChanged() diff --git a/Gwen/Control/ResizableControl.cs b/Gwen/Control/ResizableControl.cs index 4e30fbb..259eecb 100644 --- a/Gwen/Control/ResizableControl.cs +++ b/Gwen/Control/ResizableControl.cs @@ -1,5 +1,5 @@ using System; -using System.Drawing; +//using System.Drawing; using Gwen.ControlInternal; namespace Gwen.Control diff --git a/Gwen/Control/RichLabel.cs b/Gwen/Control/RichLabel.cs index 8400161..c11d15e 100644 --- a/Gwen/Control/RichLabel.cs +++ b/Gwen/Control/RichLabel.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Drawing; +//using System.Drawing; namespace Gwen.Control { diff --git a/Gwen/Control/ScrollControl.cs b/Gwen/Control/ScrollControl.cs index 48ab029..bc3dc94 100644 --- a/Gwen/Control/ScrollControl.cs +++ b/Gwen/Control/ScrollControl.cs @@ -131,7 +131,7 @@ namespace Gwen.Control /// /// /// - protected override void OnChildBoundsChanged(System.Drawing.Rectangle oldChildBounds, Base child) + protected override void OnChildBoundsChanged(Rectangle oldChildBounds, Base child) { UpdateScrollBars(); } diff --git a/Gwen/Control/Slider.cs b/Gwen/Control/Slider.cs index 501f17e..7b3f6a3 100644 --- a/Gwen/Control/Slider.cs +++ b/Gwen/Control/Slider.cs @@ -1,5 +1,5 @@ using System; -using System.Drawing; +//using System.Drawing; using Gwen.ControlInternal; using Gwen.Input; diff --git a/Gwen/Control/TabControl.cs b/Gwen/Control/TabControl.cs index 8bd5a33..7e73acd 100644 --- a/Gwen/Control/TabControl.cs +++ b/Gwen/Control/TabControl.cs @@ -1,5 +1,5 @@ using System; -using System.Drawing; +//using System.Drawing; using Gwen.ControlInternal; namespace Gwen.Control diff --git a/Gwen/Control/TabStrip.cs b/Gwen/Control/TabStrip.cs index 3e86c89..2815f14 100644 --- a/Gwen/Control/TabStrip.cs +++ b/Gwen/Control/TabStrip.cs @@ -1,5 +1,5 @@ using System; -using System.Drawing; +//using System.Drawing; using Gwen.ControlInternal; using Gwen.DragDrop; diff --git a/Gwen/Control/TextBox.cs b/Gwen/Control/TextBox.cs index 81cf90e..0890656 100644 --- a/Gwen/Control/TextBox.cs +++ b/Gwen/Control/TextBox.cs @@ -1,5 +1,5 @@ using System; -using System.Drawing; +//using System.Drawing; using Gwen.Input; namespace Gwen.Control diff --git a/Gwen/Control/TreeControl.cs b/Gwen/Control/TreeControl.cs index 53f2d7f..95fee75 100644 --- a/Gwen/Control/TreeControl.cs +++ b/Gwen/Control/TreeControl.cs @@ -59,7 +59,7 @@ namespace Gwen.Control /// /// /// - protected override void OnChildBoundsChanged(System.Drawing.Rectangle oldChildBounds, Base child) + protected override void OnChildBoundsChanged(Rectangle oldChildBounds, Base child) { if (m_ScrollControl != null) m_ScrollControl.UpdateScrollBars(); diff --git a/Gwen/Control/VerticalScrollBar.cs b/Gwen/Control/VerticalScrollBar.cs index d62f0f6..74d0f3d 100644 --- a/Gwen/Control/VerticalScrollBar.cs +++ b/Gwen/Control/VerticalScrollBar.cs @@ -1,5 +1,5 @@ using System; -using System.Drawing; +//using System.Drawing; using Gwen.Input; namespace Gwen.Control diff --git a/Gwen/Control/VerticalSlider.cs b/Gwen/Control/VerticalSlider.cs index 0a0a0ff..0cfee8c 100644 --- a/Gwen/Control/VerticalSlider.cs +++ b/Gwen/Control/VerticalSlider.cs @@ -1,5 +1,5 @@ using System; -using System.Drawing; +//using System.Drawing; namespace Gwen.Control { diff --git a/Gwen/Control/WindowControl.cs b/Gwen/Control/WindowControl.cs index 55a2772..52fd72e 100644 --- a/Gwen/Control/WindowControl.cs +++ b/Gwen/Control/WindowControl.cs @@ -1,5 +1,5 @@ using System; -using System.Drawing; +//using System.Drawing; using System.Linq; using Gwen.ControlInternal; diff --git a/Gwen/ControlInternal/ColorButton.cs b/Gwen/ControlInternal/ColorButton.cs index 49f89c1..366f703 100644 --- a/Gwen/ControlInternal/ColorButton.cs +++ b/Gwen/ControlInternal/ColorButton.cs @@ -1,5 +1,5 @@ using System; -using System.Drawing; +//using System.Drawing; using Gwen.Control; namespace Gwen.ControlInternal diff --git a/Gwen/ControlInternal/ColorDisplay.cs b/Gwen/ControlInternal/ColorDisplay.cs index 100cbbf..412cb96 100644 --- a/Gwen/ControlInternal/ColorDisplay.cs +++ b/Gwen/ControlInternal/ColorDisplay.cs @@ -1,5 +1,5 @@ using System; -using System.Drawing; +//using System.Drawing; using Gwen.Control; namespace Gwen.ControlInternal diff --git a/Gwen/ControlInternal/Dragger.cs b/Gwen/ControlInternal/Dragger.cs index 781edaf..14e099e 100644 --- a/Gwen/ControlInternal/Dragger.cs +++ b/Gwen/ControlInternal/Dragger.cs @@ -1,5 +1,5 @@ using System; -using System.Drawing; +//using System.Drawing; using Gwen.Control; using Gwen.Input; diff --git a/Gwen/ControlInternal/Resizer.cs b/Gwen/ControlInternal/Resizer.cs index 6400ca9..7d3e658 100644 --- a/Gwen/ControlInternal/Resizer.cs +++ b/Gwen/ControlInternal/Resizer.cs @@ -1,5 +1,5 @@ using System; -using System.Drawing; +//using System.Drawing; //using System.Windows.Forms; using Gwen.Control; diff --git a/Gwen/ControlInternal/Text.cs b/Gwen/ControlInternal/Text.cs index 9edec6f..5cbd2f7 100644 --- a/Gwen/ControlInternal/Text.cs +++ b/Gwen/ControlInternal/Text.cs @@ -1,7 +1,7 @@ //#define DEBUG_TEXT_MEASURE using System; -using System.Drawing; +//using System.Drawing; using Gwen.Control; namespace Gwen.ControlInternal diff --git a/Gwen/DragDrop/DragAndDrop.cs b/Gwen/DragDrop/DragAndDrop.cs index fd6ba8f..8d61ba9 100644 --- a/Gwen/DragDrop/DragAndDrop.cs +++ b/Gwen/DragDrop/DragAndDrop.cs @@ -1,5 +1,5 @@ using System; -using System.Drawing; +//using System.Drawing; //using System.Windows.Forms; using Gwen.Control; using Gwen.Input; diff --git a/Gwen/DragDrop/Package.cs b/Gwen/DragDrop/Package.cs index 0947483..b29d579 100644 --- a/Gwen/DragDrop/Package.cs +++ b/Gwen/DragDrop/Package.cs @@ -1,5 +1,5 @@ using System; -using System.Drawing; +//using System.Drawing; using Gwen.Control; namespace Gwen.DragDrop diff --git a/Gwen/Gwen.csproj b/Gwen/Gwen.csproj index d17cb97..3120a5a 100644 --- a/Gwen/Gwen.csproj +++ b/Gwen/Gwen.csproj @@ -32,7 +32,6 @@ - @@ -153,5 +152,8 @@ + + + \ No newline at end of file diff --git a/Gwen/Input/InputHandler.cs b/Gwen/Input/InputHandler.cs index f5ba899..7db7aeb 100644 --- a/Gwen/Input/InputHandler.cs +++ b/Gwen/Input/InputHandler.cs @@ -1,5 +1,5 @@ using System; -using System.Drawing; +//using System.Drawing; using System.Linq; using System.Text; using Gwen.Control; diff --git a/Gwen/Renderer/Base.cs b/Gwen/Renderer/Base.cs index 667f185..d88184e 100644 --- a/Gwen/Renderer/Base.cs +++ b/Gwen/Renderer/Base.cs @@ -1,5 +1,5 @@ using System; -using System.Drawing; +//using System.Drawing; using System.IO; namespace Gwen.Renderer diff --git a/Gwen/Skin/Base.cs b/Gwen/Skin/Base.cs index 77e9519..69bfbbe 100644 --- a/Gwen/Skin/Base.cs +++ b/Gwen/Skin/Base.cs @@ -1,5 +1,5 @@ using System; -using System.Drawing; +//using System.Drawing; namespace Gwen.Skin { diff --git a/Gwen/Skin/Simple.cs b/Gwen/Skin/Simple.cs index 21aa7f5..ab4a287 100644 --- a/Gwen/Skin/Simple.cs +++ b/Gwen/Skin/Simple.cs @@ -1,5 +1,5 @@ using System; -using System.Drawing; +//using System.Drawing; namespace Gwen.Skin { diff --git a/Gwen/Skin/SkinColors.cs b/Gwen/Skin/SkinColors.cs index c14f4d1..54ec5aa 100644 --- a/Gwen/Skin/SkinColors.cs +++ b/Gwen/Skin/SkinColors.cs @@ -1,5 +1,5 @@ using System; -using System.Drawing; +//using System.Drawing; namespace Gwen.Skin { diff --git a/Gwen/Skin/TexturedBase.cs b/Gwen/Skin/TexturedBase.cs index 5bec86d..d54e82f 100644 --- a/Gwen/Skin/TexturedBase.cs +++ b/Gwen/Skin/TexturedBase.cs @@ -1,5 +1,5 @@ using System; -using System.Drawing; +//using System.Drawing; using System.IO; using Gwen.Skin.Texturing; using Single = Gwen.Skin.Texturing.Single; diff --git a/Gwen/Skin/Texturing/Bordered.cs b/Gwen/Skin/Texturing/Bordered.cs index 5cd5708..6e6d44d 100644 --- a/Gwen/Skin/Texturing/Bordered.cs +++ b/Gwen/Skin/Texturing/Bordered.cs @@ -1,4 +1,4 @@ -using System.Drawing; +//using System.Drawing; namespace Gwen.Skin.Texturing { diff --git a/Gwen/Skin/Texturing/Single.cs b/Gwen/Skin/Texturing/Single.cs index e42fbcf..a1c1a64 100644 --- a/Gwen/Skin/Texturing/Single.cs +++ b/Gwen/Skin/Texturing/Single.cs @@ -1,5 +1,5 @@ using System; -using System.Drawing; +//using System.Drawing; namespace Gwen.Skin.Texturing { diff --git a/Gwen/ToolTip.cs b/Gwen/ToolTip.cs index ac24539..8dd6993 100644 --- a/Gwen/ToolTip.cs +++ b/Gwen/ToolTip.cs @@ -1,4 +1,4 @@ -using System.Drawing; +//using System.Drawing; using Gwen.Control; namespace Gwen diff --git a/Gwen/Util.cs b/Gwen/Util.cs index aea7ada..92302db 100644 --- a/Gwen/Util.cs +++ b/Gwen/Util.cs @@ -1,5 +1,5 @@ using System; -using System.Drawing; +//using System.Drawing; using System.Text.RegularExpressions; namespace Gwen