From f77479631191b003788f63fddfc1733198352d11 Mon Sep 17 00:00:00 2001 From: Mike Kestner Date: Tue, 10 Feb 2004 20:35:40 +0000 Subject: [PATCH] 2004-02-10 Mike Kestner * gconf/GConf.PropertyEditors/PropertyEditorColorPicker.cs : nuke a GnomeSharp. * generator/Signal.cs : move eventhandlers and args into the base namespace instead of a *Sharp namespace. * sample/*.cs : nuke using *Sharp. svn path=/trunk/gtk-sharp/; revision=22956 --- ChangeLog | 8 ++++++++ .../PropertyEditorColorPicker.cs | 4 ++-- generator/Signal.cs | 12 +++++++----- sample/ButtonApp.cs | 1 - sample/CairoSample.cs | 1 - sample/CalendarApp.cs | 1 - sample/CanvasExample.cs | 5 ++--- sample/DbClient/GnomeDbClient.cs | 4 +--- sample/DbClient/client.cs | 1 - sample/Fifteen.cs | 5 ++--- sample/GladeTest.cs | 1 - sample/GnomeHelloWorld.cs | 5 ++--- sample/GtkDemo/DemoApplicationWindow.cs | 1 - sample/GtkDemo/DemoButtonBox.cs | 1 - sample/GtkDemo/DemoColorSelection.cs | 4 +--- sample/GtkDemo/DemoDialog.cs | 1 - sample/GtkDemo/DemoDrawingArea.cs | 16 +++++----------- sample/GtkDemo/DemoEditableCells.cs | 1 - sample/GtkDemo/DemoImages.cs | 2 -- sample/GtkDemo/DemoItemFactory.cs | 1 - sample/GtkDemo/DemoListStore.cs | 1 - sample/GtkDemo/DemoMain.cs | 1 - sample/GtkDemo/DemoMenus.cs | 1 - sample/GtkDemo/DemoPanes.cs | 1 - sample/GtkDemo/DemoPixbuf.cs | 1 - sample/GtkDemo/DemoSizeGroup.cs | 1 - sample/GtkDemo/DemoStockBrowser.cs | 1 - sample/GtkDemo/DemoTextView.cs | 1 - sample/GtkDemo/DemoTreeStore.cs | 1 - sample/HelloWorld.cs | 1 - sample/ManagedTreeViewDemo.cs | 1 - sample/Menu.cs | 1 - sample/PrintSample.cs | 1 - sample/Scribble.cs | 1 - sample/Size.cs | 1 - sample/Subclass.cs | 1 - sample/TestDnd.cs | 1 - sample/TreeViewDemo.cs | 1 - sample/VteTest.cs | 7 ++----- sample/rsvg/svghelloworld.cs | 4 ++-- sample/test/TestCheckButton.cs | 1 - sample/test/TestColorSelection.cs | 1 - sample/test/TestCombo.cs | 1 - sample/test/TestDialog.cs | 1 - sample/test/TestFileSelection.cs | 1 - sample/test/TestFlipping.cs | 1 - sample/test/TestMenus.cs | 1 - sample/test/TestRadioButton.cs | 1 - sample/test/TestRange.cs | 1 - sample/test/TestSizeGroup.cs | 1 - sample/test/TestStatusbar.cs | 1 - sample/test/TestToolbar.cs | 1 - sample/test/TestTooltip.cs | 1 - sample/test/WidgetViewer.cs | 1 - 54 files changed, 34 insertions(+), 84 deletions(-) diff --git a/ChangeLog b/ChangeLog index bd5009005..ff7400fab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2004-02-10 Mike Kestner + + * gconf/GConf.PropertyEditors/PropertyEditorColorPicker.cs : + nuke a GnomeSharp. + * generator/Signal.cs : move eventhandlers and args into the + base namespace instead of a *Sharp namespace. + * sample/*.cs : nuke using *Sharp. + 2004-02-10 Mike Kestner * art/Art.metadata : mark a field private diff --git a/gconf/GConf.PropertyEditors/PropertyEditorColorPicker.cs b/gconf/GConf.PropertyEditors/PropertyEditorColorPicker.cs index 791afc1dc..0812886d8 100644 --- a/gconf/GConf.PropertyEditors/PropertyEditorColorPicker.cs +++ b/gconf/GConf.PropertyEditors/PropertyEditorColorPicker.cs @@ -24,7 +24,7 @@ namespace GConf.PropertyEditors return (byte) (val >> 8); } - void Changed (object obj, GnomeSharp.ColorSetArgs args) + void Changed (object obj, Gnome.ColorSetArgs args) { ColorPicker picker = (ColorPicker) Control; Color color = Color.FromArgb (ToByte (picker.Red), ToByte (picker.Green), ToByte (picker.Blue)); @@ -34,7 +34,7 @@ namespace GConf.PropertyEditors protected override void ConnectHandlers () { ColorPicker picker = (ColorPicker) Control; - picker.ColorSet += new GnomeSharp.ColorSetHandler (Changed); + picker.ColorSet += new Gnome.ColorSetHandler (Changed); } public PropertyEditorColorPicker (string key, ColorPicker picker) : base (key, picker) diff --git a/generator/Signal.cs b/generator/Signal.cs index b27008057..93fcd2b75 100644 --- a/generator/Signal.cs +++ b/generator/Signal.cs @@ -74,7 +74,7 @@ namespace GtkSharp.Generation { if (sig_handler.Name == "voidObjectSignal") return "System.EventArgs"; else - return container_type.NS + "Sharp." + Name + "Args"; + return container_type.NS + "." + Name + "Args"; } } @@ -82,7 +82,9 @@ namespace GtkSharp.Generation { get { if (sig_handler.Name == "voidObjectSignal") return "EventHandler"; - else + else if (SymbolTable.Table [container_type.NS + Name + "Handler"] != null) + return Name + "EventHandler"; + else return Name + "Handler"; } } @@ -92,7 +94,7 @@ namespace GtkSharp.Generation { if (sig_handler.Name == "voidObjectSignal") return "System.EventHandler"; else - return container_type.NS + "Sharp." + Name + "Handler"; + return container_type.NS + "." + EventHandlerName; } } @@ -143,9 +145,9 @@ namespace GtkSharp.Generation { string ns = container_type.NS; - StreamWriter sw = gen_info.OpenStream (ns + "Sharp." + EventHandlerName); + StreamWriter sw = gen_info.OpenStream (EventHandlerName); - sw.WriteLine ("namespace " + ns + "Sharp {"); + sw.WriteLine ("namespace " + ns + " {"); sw.WriteLine (); sw.WriteLine ("\tusing System;"); diff --git a/sample/ButtonApp.cs b/sample/ButtonApp.cs index 14a543c13..7ed2c147b 100755 --- a/sample/ButtonApp.cs +++ b/sample/ButtonApp.cs @@ -7,7 +7,6 @@ namespace GtkSamples { using Gtk; - using GtkSharp; using System; using System.Drawing; diff --git a/sample/CairoSample.cs b/sample/CairoSample.cs index 5da003c2a..407455d1e 100644 --- a/sample/CairoSample.cs +++ b/sample/CairoSample.cs @@ -4,7 +4,6 @@ using Gtk; using Gdk; using System; -using GtkSharp; using Cairo; class X { diff --git a/sample/CalendarApp.cs b/sample/CalendarApp.cs index 33f3da22e..88cb28beb 100755 --- a/sample/CalendarApp.cs +++ b/sample/CalendarApp.cs @@ -7,7 +7,6 @@ namespace GtkSamples { using Gtk; - using GtkSharp; using System; using System.Drawing; diff --git a/sample/CanvasExample.cs b/sample/CanvasExample.cs index fd21ef43e..714a77529 100644 --- a/sample/CanvasExample.cs +++ b/sample/CanvasExample.cs @@ -9,7 +9,6 @@ namespace GtkSamples { using Gnome; using Gtk; using Gdk; - using GtkSharp; using System; public class CanvasExample { @@ -89,7 +88,7 @@ namespace GtkSamples { item.OutlineColor = "black"; item.WidthUnits = 1.0; - item.CanvasEvent += new GnomeSharp.CanvasEventHandler (Item_Event); + item.CanvasEvent += new Gnome.CanvasEventHandler (Item_Event); } void ChangeItemColor (CanvasRE item) @@ -98,7 +97,7 @@ namespace GtkSamples { item.FillColor = colors[random.Next (colors.Length)]; } - void Item_Event (object obj, GnomeSharp.CanvasEventArgs args) { + void Item_Event (object obj, Gnome.CanvasEventArgs args) { EventButton ev = EventButton.New (args.Event.Handle); CanvasRE item = (CanvasRE) obj; diff --git a/sample/DbClient/GnomeDbClient.cs b/sample/DbClient/GnomeDbClient.cs index 8b5f2f43c..a2f82741c 100644 --- a/sample/DbClient/GnomeDbClient.cs +++ b/sample/DbClient/GnomeDbClient.cs @@ -1,9 +1,7 @@ using System; using Gda; using GnomeDb; -using GdaSharp; using Gtk; -using GtkSharp; class GnomeDbClient { @@ -61,7 +59,7 @@ class GnomeDbClient { if (dialog.Run () == true) { if (client == null) { client = new Gda.Client (); - client.EventNotification += new GdaSharp.EventNotificationHandler (Client_Event); + client.EventNotification += new Gda.EventNotificationHandler (Client_Event); } cnc = client.OpenConnection (dialog.Dsn, dialog.Username, dialog.Password, diff --git a/sample/DbClient/client.cs b/sample/DbClient/client.cs index ce6703804..f2611974c 100644 --- a/sample/DbClient/client.cs +++ b/sample/DbClient/client.cs @@ -5,7 +5,6 @@ using System.Data; using System.Data.SqlClient; using Gtk; -using GtkSharp; enum DialogType { diff --git a/sample/Fifteen.cs b/sample/Fifteen.cs index 73f2f6391..e137e95d3 100644 --- a/sample/Fifteen.cs +++ b/sample/Fifteen.cs @@ -4,7 +4,6 @@ using System.Drawing; using Gtk; using Gdk; using Gnome; -using GtkSharp; public class Fifteen @@ -212,7 +211,7 @@ public class BoardPiece : Gnome.CanvasGroup text.FillColor = "black"; this.Text = text; - this.CanvasEvent += new GnomeSharp.CanvasEventHandler (Piece_Event); + this.CanvasEvent += new Gnome.CanvasEventHandler (Piece_Event); } public string Color { @@ -239,7 +238,7 @@ public class BoardPiece : Gnome.CanvasGroup } } - static void Piece_Event (object o, GnomeSharp.CanvasEventArgs args) + static void Piece_Event (object o, Gnome.CanvasEventArgs args) { BoardPiece piece = (BoardPiece) o; Canvas canvas = piece.Canvas; diff --git a/sample/GladeTest.cs b/sample/GladeTest.cs index 8c5017153..761a9c742 100644 --- a/sample/GladeTest.cs +++ b/sample/GladeTest.cs @@ -9,7 +9,6 @@ namespace GladeSamples { using Gtk; using Glade; - using GtkSharp; public class GladeTest { diff --git a/sample/GnomeHelloWorld.cs b/sample/GnomeHelloWorld.cs index 38c0538f4..b29765efc 100644 --- a/sample/GnomeHelloWorld.cs +++ b/sample/GnomeHelloWorld.cs @@ -8,7 +8,6 @@ namespace GtkSamples { using Gtk; using Gdk; - using GtkSharp; using Gnome; using System; using System.IO; @@ -57,7 +56,7 @@ namespace GtkSamples { entry.desc); } - icons.IconSelected += new GnomeSharp.IconSelectedHandler (icon_selected_cb); + icons.IconSelected += new Gnome.IconSelectedHandler (icon_selected_cb); return icons; } @@ -149,7 +148,7 @@ namespace GtkSamples { [DllImport("glib-2.0")] static extern bool g_spawn_command_line_async (string command, IntPtr err); - void icon_selected_cb (object obj, GnomeSharp.IconSelectedArgs args) + void icon_selected_cb (object obj, Gnome.IconSelectedArgs args) { int idx = args.Num; Event ev_any = args.Event; diff --git a/sample/GtkDemo/DemoApplicationWindow.cs b/sample/GtkDemo/DemoApplicationWindow.cs index 56e36cda9..eb6e47495 100644 --- a/sample/GtkDemo/DemoApplicationWindow.cs +++ b/sample/GtkDemo/DemoApplicationWindow.cs @@ -16,7 +16,6 @@ using System; using Gtk; -using GtkSharp; namespace GtkDemo { diff --git a/sample/GtkDemo/DemoButtonBox.cs b/sample/GtkDemo/DemoButtonBox.cs index e9fb8dc38..879abdd52 100644 --- a/sample/GtkDemo/DemoButtonBox.cs +++ b/sample/GtkDemo/DemoButtonBox.cs @@ -14,7 +14,6 @@ using System; using Gtk; -using GtkSharp; namespace GtkDemo { diff --git a/sample/GtkDemo/DemoColorSelection.cs b/sample/GtkDemo/DemoColorSelection.cs index e4dac4968..6403027ba 100644 --- a/sample/GtkDemo/DemoColorSelection.cs +++ b/sample/GtkDemo/DemoColorSelection.cs @@ -16,7 +16,6 @@ using System; using Gdk; using Gtk; -using GtkSharp; namespace GtkDemo @@ -77,8 +76,7 @@ namespace GtkDemo true, area.X, area.Y, area.Width, area.Height); - SignalArgs sa = (SignalArgs) args; - sa.RetVal = true; + args.RetVal = true; } private void ChangeColorCallback (object o, EventArgs args) diff --git a/sample/GtkDemo/DemoDialog.cs b/sample/GtkDemo/DemoDialog.cs index 7c397152c..c609ea8de 100644 --- a/sample/GtkDemo/DemoDialog.cs +++ b/sample/GtkDemo/DemoDialog.cs @@ -19,7 +19,6 @@ using System; using Gtk; -using GtkSharp; namespace GtkDemo { diff --git a/sample/GtkDemo/DemoDrawingArea.cs b/sample/GtkDemo/DemoDrawingArea.cs index 5e5eba020..52d489c05 100644 --- a/sample/GtkDemo/DemoDrawingArea.cs +++ b/sample/GtkDemo/DemoDrawingArea.cs @@ -27,7 +27,6 @@ using System; using Gtk; using Gdk; -using GtkSharp; namespace GtkDemo { public class DemoDrawingArea @@ -148,8 +147,7 @@ namespace GtkDemo { } // return true because we've handled this event, so no // further processing is required. - SignalArgs sa = (SignalArgs) args; - sa.RetVal = true; + args.RetVal = true; } @@ -168,8 +166,7 @@ namespace GtkDemo { area.X, area.Y, area.X, area.Y, area.Width, area.Height); - SignalArgs sa = (SignalArgs) args; - sa.RetVal = false; + args.RetVal = false; } // Create a new pixmap of the appropriate size to store our scribbles @@ -185,9 +182,8 @@ namespace GtkDemo { // Initialize the pixmap to white pixmap.DrawRectangle (drawingArea1.Style.WhiteGC, true, 0, 0, allocation.Width, allocation.Height); - SignalArgs sa = (SignalArgs) args; // We've handled the configure event, no need for further processing. - sa.RetVal = true; + args.RetVal = true; } private void ScribbleMotionNotify (object o, MotionNotifyEventArgs args) @@ -221,8 +217,7 @@ namespace GtkDemo { if ((state & ModifierType.Button1Mask) != 0 && pixmap != null) DrawBrush (x, y); /* We've handled it, stop processing */ - SignalArgs sa = (SignalArgs) args; - sa.RetVal = true; + args.RetVal = true; } @@ -249,8 +244,7 @@ namespace GtkDemo { if (ev.Button == 1 && pixmap != null) DrawBrush (ev.X, ev.Y); //We've handled the event, stop processing - SignalArgs sa = (SignalArgs) args; - sa.RetVal = true; + args.RetVal = true; } } } diff --git a/sample/GtkDemo/DemoEditableCells.cs b/sample/GtkDemo/DemoEditableCells.cs index 1699e4602..5aec3acef 100644 --- a/sample/GtkDemo/DemoEditableCells.cs +++ b/sample/GtkDemo/DemoEditableCells.cs @@ -18,7 +18,6 @@ using System; using System.Collections; using Gtk; -using GtkSharp; namespace GtkDemo { diff --git a/sample/GtkDemo/DemoImages.cs b/sample/GtkDemo/DemoImages.cs index 4e3b1d0d0..9169664a7 100644 --- a/sample/GtkDemo/DemoImages.cs +++ b/sample/GtkDemo/DemoImages.cs @@ -30,8 +30,6 @@ using System.IO; using Gtk; using Gdk; -using GtkSharp; -using GdkSharp; namespace GtkDemo { public class DemoImages diff --git a/sample/GtkDemo/DemoItemFactory.cs b/sample/GtkDemo/DemoItemFactory.cs index 4d1fb852b..12cfcfe40 100644 --- a/sample/GtkDemo/DemoItemFactory.cs +++ b/sample/GtkDemo/DemoItemFactory.cs @@ -18,7 +18,6 @@ using System.IO; using Gtk; using Gdk; -using GtkSharp; namespace GtkDemo { diff --git a/sample/GtkDemo/DemoListStore.cs b/sample/GtkDemo/DemoListStore.cs index 13477e632..ca3db28a9 100644 --- a/sample/GtkDemo/DemoListStore.cs +++ b/sample/GtkDemo/DemoListStore.cs @@ -18,7 +18,6 @@ using System; using System.Collections; using Gtk; -using GtkSharp; namespace GtkDemo { diff --git a/sample/GtkDemo/DemoMain.cs b/sample/GtkDemo/DemoMain.cs index e382c7991..9d6b18638 100644 --- a/sample/GtkDemo/DemoMain.cs +++ b/sample/GtkDemo/DemoMain.cs @@ -11,7 +11,6 @@ using System.Collections; using Gdk; using Gtk; -using GtkSharp; using Pango; namespace GtkDemo diff --git a/sample/GtkDemo/DemoMenus.cs b/sample/GtkDemo/DemoMenus.cs index 7636efbe2..b5aa8d37e 100644 --- a/sample/GtkDemo/DemoMenus.cs +++ b/sample/GtkDemo/DemoMenus.cs @@ -43,7 +43,6 @@ using System; using Gtk; -using GtkSharp; namespace GtkDemo { diff --git a/sample/GtkDemo/DemoPanes.cs b/sample/GtkDemo/DemoPanes.cs index c0e2e09a8..8f406562e 100644 --- a/sample/GtkDemo/DemoPanes.cs +++ b/sample/GtkDemo/DemoPanes.cs @@ -24,7 +24,6 @@ using System; using Gtk; -using GtkSharp; namespace GtkDemo { diff --git a/sample/GtkDemo/DemoPixbuf.cs b/sample/GtkDemo/DemoPixbuf.cs index c50aadc24..dfec980b9 100644 --- a/sample/GtkDemo/DemoPixbuf.cs +++ b/sample/GtkDemo/DemoPixbuf.cs @@ -22,7 +22,6 @@ using Gdk; using Gtk; -using GtkSharp; using System; diff --git a/sample/GtkDemo/DemoSizeGroup.cs b/sample/GtkDemo/DemoSizeGroup.cs index b616552b0..44ee194f7 100644 --- a/sample/GtkDemo/DemoSizeGroup.cs +++ b/sample/GtkDemo/DemoSizeGroup.cs @@ -24,7 +24,6 @@ using System; using Gtk; -using GtkSharp; namespace GtkDemo { diff --git a/sample/GtkDemo/DemoStockBrowser.cs b/sample/GtkDemo/DemoStockBrowser.cs index 3239c12b2..0cf249d94 100644 --- a/sample/GtkDemo/DemoStockBrowser.cs +++ b/sample/GtkDemo/DemoStockBrowser.cs @@ -8,7 +8,6 @@ using System; using Gtk; -using GtkSharp; namespace GtkDemo { diff --git a/sample/GtkDemo/DemoTextView.cs b/sample/GtkDemo/DemoTextView.cs index ed7fc5b98..c559c80d5 100644 --- a/sample/GtkDemo/DemoTextView.cs +++ b/sample/GtkDemo/DemoTextView.cs @@ -20,7 +20,6 @@ using System.IO; using Gdk; using Gtk; -using GtkSharp; namespace GtkDemo { diff --git a/sample/GtkDemo/DemoTreeStore.cs b/sample/GtkDemo/DemoTreeStore.cs index 2b4e07056..b1f801eac 100644 --- a/sample/GtkDemo/DemoTreeStore.cs +++ b/sample/GtkDemo/DemoTreeStore.cs @@ -18,7 +18,6 @@ using System; using System.Collections; using Gtk; -using GtkSharp; using GLib; namespace GtkDemo diff --git a/sample/HelloWorld.cs b/sample/HelloWorld.cs index ce0191589..15fdec0e2 100755 --- a/sample/HelloWorld.cs +++ b/sample/HelloWorld.cs @@ -8,7 +8,6 @@ namespace GtkSamples { using Gtk; using Gdk; - using GtkSharp; using System; public class HelloWorld { diff --git a/sample/ManagedTreeViewDemo.cs b/sample/ManagedTreeViewDemo.cs index a13db568f..2978f6130 100644 --- a/sample/ManagedTreeViewDemo.cs +++ b/sample/ManagedTreeViewDemo.cs @@ -10,7 +10,6 @@ namespace GtkSamples { using System.Runtime.InteropServices; using Gtk; - using GtkSharp; public class TreeViewDemo { private static ListStore store = null; diff --git a/sample/Menu.cs b/sample/Menu.cs index 6b5ecb570..13960c6d7 100755 --- a/sample/Menu.cs +++ b/sample/Menu.cs @@ -9,7 +9,6 @@ namespace GtkSharp.Samples { using System; using System.Drawing; using Gtk; - using GtkSharp; public class MenuApp { diff --git a/sample/PrintSample.cs b/sample/PrintSample.cs index 172f26ea9..10aa2eb6a 100644 --- a/sample/PrintSample.cs +++ b/sample/PrintSample.cs @@ -1,6 +1,5 @@ using System; using Gtk; -using GtkSharp; using Gnome; class PrintSample diff --git a/sample/Scribble.cs b/sample/Scribble.cs index 8c3f899d3..df18c3e3e 100644 --- a/sample/Scribble.cs +++ b/sample/Scribble.cs @@ -8,7 +8,6 @@ namespace GtkSamples { using Gtk; using Gdk; - using GtkSharp; using System; public class Scribble { diff --git a/sample/Size.cs b/sample/Size.cs index 0ec9bcdb6..b2d5cce79 100644 --- a/sample/Size.cs +++ b/sample/Size.cs @@ -8,7 +8,6 @@ namespace GtkSamples { using Gtk; using Gdk; - using GtkSharp; using System; public class SizeTest { diff --git a/sample/Subclass.cs b/sample/Subclass.cs index a4ebbc43a..2c522290c 100755 --- a/sample/Subclass.cs +++ b/sample/Subclass.cs @@ -7,7 +7,6 @@ namespace GtkSamples { using Gtk; - using GtkSharp; using System; using System.Drawing; diff --git a/sample/TestDnd.cs b/sample/TestDnd.cs index e3a36ead1..e42eee84d 100644 --- a/sample/TestDnd.cs +++ b/sample/TestDnd.cs @@ -1,6 +1,5 @@ using Gtk; using Gdk; -using GtkSharp; using GLib; using System; diff --git a/sample/TreeViewDemo.cs b/sample/TreeViewDemo.cs index 42532618d..5fcaa1b01 100644 --- a/sample/TreeViewDemo.cs +++ b/sample/TreeViewDemo.cs @@ -9,7 +9,6 @@ namespace GtkSamples { using System.Reflection; using Gtk; - using GtkSharp; public class TreeViewDemo { private static TreeStore store = null; diff --git a/sample/VteTest.cs b/sample/VteTest.cs index 0a55eaa4a..b8a8232c5 100644 --- a/sample/VteTest.cs +++ b/sample/VteTest.cs @@ -1,10 +1,7 @@ using System; using Gtk; -using GtkSharp; using Gnome; -using GnomeSharp; using Vte; -using VteSharp; class T { @@ -31,7 +28,7 @@ class T term.DeleteBinding = TerminalEraseBinding.Auto; term.Encoding = "UTF-8"; term.FontFromString = "Monospace"; - term.Commit += new VteSharp.CommitHandler (OnCommit); + term.Commit += new Vte.CommitHandler (OnCommit); term.TextDeleted += new EventHandler (OnTextDeleted); Gdk.Color white = new Gdk.Color (); @@ -59,7 +56,7 @@ class T program.Run (); } - private void OnCommit (object o, VteSharp.CommitArgs args) + private void OnCommit (object o, Vte.CommitArgs args) { Terminal term = (Terminal) o; if (args.P0 == "\r") diff --git a/sample/rsvg/svghelloworld.cs b/sample/rsvg/svghelloworld.cs index bd0b093db..d92c12199 100644 --- a/sample/rsvg/svghelloworld.cs +++ b/sample/rsvg/svghelloworld.cs @@ -30,7 +30,7 @@ { this.program = gnome_program; - this.DeleteEvent += new GtkSharp.DeleteEventHandler(delete_event); + this.DeleteEvent += new Gtk.DeleteEventHandler(delete_event); string svg_file_name = "sample.svg"; @@ -42,7 +42,7 @@ this.Contents = image; } - private void delete_event(object obj, GtkSharp.DeleteEventArgs args) + private void delete_event(object obj, Gtk.DeleteEventArgs args) { this.program.Quit(); } diff --git a/sample/test/TestCheckButton.cs b/sample/test/TestCheckButton.cs index 3c90e4ce6..e9cfed121 100644 --- a/sample/test/TestCheckButton.cs +++ b/sample/test/TestCheckButton.cs @@ -9,7 +9,6 @@ using System; using Gtk; -using GtkSharp; namespace WidgetViewer { public class TestCheckButton diff --git a/sample/test/TestColorSelection.cs b/sample/test/TestColorSelection.cs index b16e3c3fc..eeb9cf049 100644 --- a/sample/test/TestColorSelection.cs +++ b/sample/test/TestColorSelection.cs @@ -10,7 +10,6 @@ using System; using System.Text; using Gtk; -using GtkSharp; namespace WidgetViewer { public class TestColorSelection diff --git a/sample/test/TestCombo.cs b/sample/test/TestCombo.cs index fe0cc1b69..d1912e0c0 100644 --- a/sample/test/TestCombo.cs +++ b/sample/test/TestCombo.cs @@ -9,7 +9,6 @@ using System; using Gtk; -using GtkSharp; namespace WidgetViewer { public class TestCombo diff --git a/sample/test/TestDialog.cs b/sample/test/TestDialog.cs index 84e21f3e2..39a2fb50a 100644 --- a/sample/test/TestDialog.cs +++ b/sample/test/TestDialog.cs @@ -10,7 +10,6 @@ using System; using Gtk; -using GtkSharp; namespace WidgetViewer { public class TestDialog diff --git a/sample/test/TestFileSelection.cs b/sample/test/TestFileSelection.cs index 44ac83de9..af0842bb2 100644 --- a/sample/test/TestFileSelection.cs +++ b/sample/test/TestFileSelection.cs @@ -9,7 +9,6 @@ using System; using Gtk; -using GtkSharp; namespace WidgetViewer { public class TestFileSelection diff --git a/sample/test/TestFlipping.cs b/sample/test/TestFlipping.cs index 8067a52d4..57c496b53 100644 --- a/sample/test/TestFlipping.cs +++ b/sample/test/TestFlipping.cs @@ -9,7 +9,6 @@ using System; using Gtk; -using GtkSharp; namespace WidgetViewer { public class TestFlipping { diff --git a/sample/test/TestMenus.cs b/sample/test/TestMenus.cs index 9a9f8b4a1..fcdbaf147 100644 --- a/sample/test/TestMenus.cs +++ b/sample/test/TestMenus.cs @@ -9,7 +9,6 @@ using System; using Gtk; -using GtkSharp; namespace WidgetViewer { public class TestMenus { diff --git a/sample/test/TestRadioButton.cs b/sample/test/TestRadioButton.cs index da14d7807..12b44672e 100644 --- a/sample/test/TestRadioButton.cs +++ b/sample/test/TestRadioButton.cs @@ -9,7 +9,6 @@ using System; using Gtk; -using GtkSharp; namespace WidgetViewer { public class TestRadioButton diff --git a/sample/test/TestRange.cs b/sample/test/TestRange.cs index 82fdf908a..82fb81105 100644 --- a/sample/test/TestRange.cs +++ b/sample/test/TestRange.cs @@ -9,7 +9,6 @@ using System; using Gtk; -using GtkSharp; namespace WidgetViewer { diff --git a/sample/test/TestSizeGroup.cs b/sample/test/TestSizeGroup.cs index dc24a3f62..f920154e5 100644 --- a/sample/test/TestSizeGroup.cs +++ b/sample/test/TestSizeGroup.cs @@ -9,7 +9,6 @@ using System; using Gtk; -using GtkSharp; namespace WidgetViewer { public class TestSizeGroup { diff --git a/sample/test/TestStatusbar.cs b/sample/test/TestStatusbar.cs index 4631ed6e6..083e67967 100644 --- a/sample/test/TestStatusbar.cs +++ b/sample/test/TestStatusbar.cs @@ -9,7 +9,6 @@ using System; using Gtk; -using GtkSharp; namespace WidgetViewer { diff --git a/sample/test/TestToolbar.cs b/sample/test/TestToolbar.cs index ae90129d5..3376c183f 100644 --- a/sample/test/TestToolbar.cs +++ b/sample/test/TestToolbar.cs @@ -9,7 +9,6 @@ using System; using Gtk; -using GtkSharp; namespace WidgetViewer { public class TestToolbar { diff --git a/sample/test/TestTooltip.cs b/sample/test/TestTooltip.cs index c212f8247..300effe9f 100644 --- a/sample/test/TestTooltip.cs +++ b/sample/test/TestTooltip.cs @@ -9,7 +9,6 @@ using System; using Gtk; -using GtkSharp; namespace WidgetViewer { public class TestToolTip diff --git a/sample/test/WidgetViewer.cs b/sample/test/WidgetViewer.cs index ccab95f35..675d4a7f0 100644 --- a/sample/test/WidgetViewer.cs +++ b/sample/test/WidgetViewer.cs @@ -9,7 +9,6 @@ using System; using Gtk; -using GtkSharp; namespace WidgetViewer { public class Viewer