diff --git a/ChangeLog b/ChangeLog index 4889898fe..f457aacd5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2002-10-26 Mike Kestner + + * gconf/GConf.PropertyEditors/PropertyEditorColorPicker.cs : ns stuff + * glade/XML.custom : more GnomeSharp namespace stuff + * gnome/CanvasProxy.cs : ditto + * sample/CanvasExample.cs : ditto + * sample/Fifteen.cs : ditto + * sample/GnomeHelloWorld.cs : ditto + 2002-10-26 Mike Kestner Much of this patch from Vlad, with substantial rework by mk. diff --git a/gconf/GConf.PropertyEditors/PropertyEditorColorPicker.cs b/gconf/GConf.PropertyEditors/PropertyEditorColorPicker.cs index d179f54dd..791afc1dc 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, ColorSetArgs args) + void Changed (object obj, GnomeSharp.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 ColorSetHandler (Changed); + picker.ColorSet += new GnomeSharp.ColorSetHandler (Changed); } public PropertyEditorColorPicker (string key, ColorPicker picker) : base (key, picker) diff --git a/glade/XML.custom b/glade/XML.custom index c50ee55aa..79a300579 100644 --- a/glade/XML.custom +++ b/glade/XML.custom @@ -7,14 +7,14 @@ // This code is inserted after the automatically generated code. // keep this around so it doesn't get GC'd - static GtkSharp.GladeXMLCustomWidgetHandlerWrapper callback_wrapper = null; + static GladeSharp.XMLCustomWidgetHandlerWrapper callback_wrapper = null; [DllImport("glade-2.0")] - static extern void glade_set_custom_handler (GtkSharp.GladeXMLCustomWidgetHandlerNative handler, IntPtr user_data); + static extern void glade_set_custom_handler (GladeSharp.XMLCustomWidgetHandlerNative handler, IntPtr user_data); static public void SetCustomHandler (Glade.XMLCustomWidgetHandler handler) { - callback_wrapper = new GtkSharp.GladeXMLCustomWidgetHandlerWrapper (handler); + callback_wrapper = new GladeSharp.XMLCustomWidgetHandlerWrapper (handler); glade_set_custom_handler (callback_wrapper.NativeDelegate, IntPtr.Zero); } diff --git a/gnome/CanvasProxy.cs b/gnome/CanvasProxy.cs index 1f9e3d742..60283e2c8 100644 --- a/gnome/CanvasProxy.cs +++ b/gnome/CanvasProxy.cs @@ -41,7 +41,7 @@ namespace Gnome { public event EventHandler Realize { add { if (EventList["realize"] == null) - Signals["realize"] = new GtkSharp.Gtk.voidObjectSignal(this, Handle, "realize", value, System.Type.GetType("EventArgs")); + Signals["realize"] = new GtkSharp.voidObjectSignal(this, Handle, "realize", value, System.Type.GetType("EventArgs")); EventList.AddHandler("realize", value); } remove { @@ -54,7 +54,7 @@ namespace Gnome { public event EventHandler Unrealize { add { if (EventList["unrealize"] == null) - Signals["unrealize"] = new GtkSharp.Gtk.voidObjectSignal(this, Handle, "unrealize", value, System.Type.GetType("EventArgs")); + Signals["unrealize"] = new GtkSharp.voidObjectSignal(this, Handle, "unrealize", value, System.Type.GetType("EventArgs")); EventList.AddHandler("unrealize", value); } remove { @@ -67,7 +67,7 @@ namespace Gnome { public event EventHandler Map { add { if (EventList["map"] == null) - Signals["map"] = new GtkSharp.Gtk.voidObjectSignal(this, Handle, "map", value, System.Type.GetType("EventArgs")); + Signals["map"] = new GtkSharp.voidObjectSignal(this, Handle, "map", value, System.Type.GetType("EventArgs")); EventList.AddHandler("map", value); } remove { @@ -80,7 +80,7 @@ namespace Gnome { public event EventHandler Unmap { add { if (EventList["unmap"] == null) - Signals["unmap"] = new GtkSharp.Gtk.voidObjectSignal(this, Handle, "unmap", value, System.Type.GetType("EventArgs")); + Signals["unmap"] = new GtkSharp.voidObjectSignal(this, Handle, "unmap", value, System.Type.GetType("EventArgs")); EventList.AddHandler("unmap", value); } remove { diff --git a/sample/CanvasExample.cs b/sample/CanvasExample.cs index f60b6fd77..43197a545 100644 --- a/sample/CanvasExample.cs +++ b/sample/CanvasExample.cs @@ -89,7 +89,7 @@ namespace GtkSamples { item.OutlineColor = "black"; item.WidthUnits = 1.0; - item.CanvasEvent += new CanvasEventHandler (Item_Event); + item.CanvasEvent += new GnomeSharp.CanvasEventHandler (Item_Event); } void ChangeItemColor (CanvasRE item) @@ -98,7 +98,7 @@ namespace GtkSamples { item.FillColor = colors[random.Next (colors.Length)]; } - void Item_Event (object obj, CanvasEventArgs args) { + void Item_Event (object obj, GnomeSharp.CanvasEventArgs args) { EventButton ev = EventButton.New (args.Event.Handle); SignalArgs sa = (SignalArgs) args; CanvasRE item = (CanvasRE) obj; diff --git a/sample/Fifteen.cs b/sample/Fifteen.cs index 68e300893..d3e81bf31 100644 --- a/sample/Fifteen.cs +++ b/sample/Fifteen.cs @@ -212,7 +212,7 @@ public class BoardPiece : Gnome.CanvasGroup text.FillColor = "black"; this.Text = text; - this.CanvasEvent += new CanvasEventHandler (Piece_Event); + this.CanvasEvent += new GnomeSharp.CanvasEventHandler (Piece_Event); } public string Color { @@ -239,7 +239,7 @@ public class BoardPiece : Gnome.CanvasGroup } } - static void Piece_Event (object o, CanvasEventArgs args) + static void Piece_Event (object o, GnomeSharp.CanvasEventArgs args) { BoardPiece piece = (BoardPiece) o; Canvas canvas = piece.Canvas; diff --git a/sample/GnomeHelloWorld.cs b/sample/GnomeHelloWorld.cs index 6bb7cf5f8..039ddadc8 100644 --- a/sample/GnomeHelloWorld.cs +++ b/sample/GnomeHelloWorld.cs @@ -57,7 +57,7 @@ namespace GtkSamples { entry.desc); } - icons.IconSelected += new IconSelectedHandler (icon_selected_cb); + icons.IconSelected += new GnomeSharp.IconSelectedHandler (icon_selected_cb); return icons; } @@ -150,7 +150,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, IconSelectedArgs args) + void icon_selected_cb (object obj, GnomeSharp.IconSelectedArgs args) { int idx = args.Num; Event ev_any = args.Event;