ryujinx-archive/GtkSharp
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

2004-02-10 Mike Kestner <mkestner@ximian.com>

Browse source 
* 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
This commit is contained in:
Mike Kestner 2004-02-10 20:35:40 +00:00
parent d41f6593b0
commit f774796311
54 changed files with 34 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2004-02-10 Mike Kestner <mkestner@ximian.com>
* 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 <mkestner@ximian.com>
* art/Art.metadata : mark a field private

4
gconf/GConf.PropertyEditors/PropertyEditorColorPicker.cs
View file

@ -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)

10
generator/Signal.cs
View file

@ -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,6 +82,8 @@ namespace GtkSharp.Generation {
get {
if (sig_handler.Name == "voidObjectSignal")
return "EventHandler";
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;");

1
sample/ButtonApp.cs
View file

@ -7,7 +7,6 @@
namespace GtkSamples {
using Gtk;
using GtkSharp;
using System;
using System.Drawing;

1
sample/CairoSample.cs
View file

@ -4,7 +4,6 @@
using Gtk;
using Gdk;
using System;
using GtkSharp;
using Cairo;
class X {

1
sample/CalendarApp.cs
View file

@ -7,7 +7,6 @@
namespace GtkSamples {
using Gtk;
using GtkSharp;
using System;
using System.Drawing;

5
sample/CanvasExample.cs
View file

@ -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;

4
sample/DbClient/GnomeDbClient.cs
View file

@ -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,

1
sample/DbClient/client.cs
View file

@ -5,7 +5,6 @@ using System.Data;
using System.Data.SqlClient;
using Gtk;
using GtkSharp;
enum DialogType
{

5
sample/Fifteen.cs
View file

@ -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;

1
sample/GladeTest.cs
View file

@ -9,7 +9,6 @@ namespace GladeSamples {
using Gtk;
using Glade;
using GtkSharp;
public class GladeTest
{

5
sample/GnomeHelloWorld.cs
View file

@ -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;

1
sample/GtkDemo/DemoApplicationWindow.cs
View file

@ -16,7 +16,6 @@
using System;
using Gtk;
using GtkSharp;
namespace GtkDemo
{

1
sample/GtkDemo/DemoButtonBox.cs
View file

@ -14,7 +14,6 @@
using System;
using Gtk;
using GtkSharp;
namespace GtkDemo
{

4
sample/GtkDemo/DemoColorSelection.cs
View file

@ -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)

1
sample/GtkDemo/DemoDialog.cs
View file

@ -19,7 +19,6 @@
using System;
using Gtk;
using GtkSharp;
namespace GtkDemo
{

16
sample/GtkDemo/DemoDrawingArea.cs
View file

@ -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;
}
}
}

1
sample/GtkDemo/DemoEditableCells.cs
View file

@ -18,7 +18,6 @@ using System;
using System.Collections;
using Gtk;
using GtkSharp;
namespace GtkDemo
{

2
sample/GtkDemo/DemoImages.cs
View file

@ -30,8 +30,6 @@ using System.IO;
using Gtk;
using Gdk;
using GtkSharp;
using GdkSharp;
namespace GtkDemo {
public class DemoImages

1
sample/GtkDemo/DemoItemFactory.cs
View file

@ -18,7 +18,6 @@ using System.IO;
using Gtk;
using Gdk;
using GtkSharp;
namespace GtkDemo
{

1
sample/GtkDemo/DemoListStore.cs
View file

@ -18,7 +18,6 @@ using System;
using System.Collections;
using Gtk;
using GtkSharp;
namespace GtkDemo
{

1
sample/GtkDemo/DemoMain.cs
View file

@ -11,7 +11,6 @@ using System.Collections;
using Gdk;
using Gtk;
using GtkSharp;
using Pango;
namespace GtkDemo

1
sample/GtkDemo/DemoMenus.cs
View file

@ -43,7 +43,6 @@
using System;
using Gtk;
using GtkSharp;
namespace GtkDemo
{

1
sample/GtkDemo/DemoPanes.cs
View file

@ -24,7 +24,6 @@
using System;
using Gtk;
using GtkSharp;
namespace GtkDemo
{

1
sample/GtkDemo/DemoPixbuf.cs
View file

@ -22,7 +22,6 @@
using Gdk;
using Gtk;
using GtkSharp;
using System;

1
sample/GtkDemo/DemoSizeGroup.cs
View file

@ -24,7 +24,6 @@
using System;
using Gtk;
using GtkSharp;
namespace GtkDemo
{

1
sample/GtkDemo/DemoStockBrowser.cs
View file

@ -8,7 +8,6 @@
using System;
using Gtk;
using GtkSharp;
namespace GtkDemo
{

1
sample/GtkDemo/DemoTextView.cs
View file

@ -20,7 +20,6 @@ using System.IO;
using Gdk;
using Gtk;
using GtkSharp;
namespace GtkDemo
{

1
sample/GtkDemo/DemoTreeStore.cs
View file

@ -18,7 +18,6 @@ using System;
using System.Collections;
using Gtk;
using GtkSharp;
using GLib;
namespace GtkDemo

1
sample/HelloWorld.cs
View file

@ -8,7 +8,6 @@ namespace GtkSamples {
using Gtk;
using Gdk;
using GtkSharp;
using System;
public class HelloWorld {

1
sample/ManagedTreeViewDemo.cs
View file

@ -10,7 +10,6 @@ namespace GtkSamples {
using System.Runtime.InteropServices;
using Gtk;
using GtkSharp;
public class TreeViewDemo {
private static ListStore store = null;

1
sample/Menu.cs
View file

@ -9,7 +9,6 @@ namespace GtkSharp.Samples {
using System;
using System.Drawing;
using Gtk;
using GtkSharp;
public class MenuApp {

1
sample/PrintSample.cs
View file

@ -1,6 +1,5 @@
using System;
using Gtk;
using GtkSharp;
using Gnome;
class PrintSample

1
sample/Scribble.cs
View file

@ -8,7 +8,6 @@ namespace GtkSamples {
using Gtk;
using Gdk;
using GtkSharp;
using System;
public class Scribble {

1
sample/Size.cs
View file

@ -8,7 +8,6 @@ namespace GtkSamples {
using Gtk;
using Gdk;
using GtkSharp;
using System;
public class SizeTest {

1
sample/Subclass.cs
View file

@ -7,7 +7,6 @@
namespace GtkSamples {
using Gtk;
using GtkSharp;
using System;
using System.Drawing;

1
sample/TestDnd.cs
View file

@ -1,6 +1,5 @@
using Gtk;
using Gdk;
using GtkSharp;
using GLib;
using System;

1
sample/TreeViewDemo.cs
View file

@ -9,7 +9,6 @@ namespace GtkSamples {
using System.Reflection;
using Gtk;
using GtkSharp;
public class TreeViewDemo {
private static TreeStore store = null;

7
sample/VteTest.cs
View file

@ -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")

4
sample/rsvg/svghelloworld.cs
View file

@ -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();
}

1
sample/test/TestCheckButton.cs
View file

@ -9,7 +9,6 @@
using System;
using Gtk;
using GtkSharp;
namespace WidgetViewer {
public class TestCheckButton

1
sample/test/TestColorSelection.cs
View file

@ -10,7 +10,6 @@ using System;
using System.Text;
using Gtk;
using GtkSharp;
namespace WidgetViewer {
public class TestColorSelection

1
sample/test/TestCombo.cs
View file

@ -9,7 +9,6 @@
using System;
using Gtk;
using GtkSharp;
namespace WidgetViewer {
public class TestCombo

1
sample/test/TestDialog.cs
View file

@ -10,7 +10,6 @@
using System;
using Gtk;
using GtkSharp;
namespace WidgetViewer {
public class TestDialog

1
sample/test/TestFileSelection.cs
View file

@ -9,7 +9,6 @@
using System;
using Gtk;
using GtkSharp;
namespace WidgetViewer {
public class TestFileSelection

1
sample/test/TestFlipping.cs
View file

@ -9,7 +9,6 @@
using System;
using Gtk;
using GtkSharp;
namespace WidgetViewer {
public class TestFlipping {

1
sample/test/TestMenus.cs
View file

@ -9,7 +9,6 @@
using System;
using Gtk;
using GtkSharp;
namespace WidgetViewer {
public class TestMenus {

1
sample/test/TestRadioButton.cs
View file

@ -9,7 +9,6 @@
using System;
using Gtk;
using GtkSharp;
namespace WidgetViewer {
public class TestRadioButton

1
sample/test/TestRange.cs
View file

@ -9,7 +9,6 @@
using System;
using Gtk;
using GtkSharp;
namespace WidgetViewer {

1
sample/test/TestSizeGroup.cs
View file

@ -9,7 +9,6 @@
using System;
using Gtk;
using GtkSharp;
namespace WidgetViewer {
public class TestSizeGroup {

1
sample/test/TestStatusbar.cs
View file

@ -9,7 +9,6 @@
using System;
using Gtk;
using GtkSharp;
namespace WidgetViewer {

1
sample/test/TestToolbar.cs
View file

@ -9,7 +9,6 @@
using System;
using Gtk;
using GtkSharp;
namespace WidgetViewer {
public class TestToolbar {

1
sample/test/TestTooltip.cs
View file

@ -9,7 +9,6 @@
using System;
using Gtk;
using GtkSharp;
namespace WidgetViewer {
public class TestToolTip

1
sample/test/WidgetViewer.cs
View file

@ -9,7 +9,6 @@
using System;
using Gtk;
using GtkSharp;
namespace WidgetViewer {
public class Viewer