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

2002-12-24 Mike Kestner <mkestner@speakeasy.net>

Browse source 
* generator/ObjectGen.cs : generate protected GType ctors
	* generator/SymbolTable.cs : map GType to uint
	* glib/Object.cs : add GType ctor. add RegisterGType.
	* glue/type.c (gtksharp_register_type): new GType registrar
	* */*.custom : make GType params uints
	* sample/Subclass.cs : a simple type registration example

svn path=/trunk/gtk-sharp/; revision=9870
This commit is contained in:
Mike Kestner 2002-12-25 00:36:00 +00:00
parent e0ec6df596
commit f750d78d6a
13 changed files with 128 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2002-12-24 Mike Kestner <mkestner@speakeasy.net>
* generator/ObjectGen.cs : generate protected GType ctors
* generator/SymbolTable.cs : map GType to uint
* glib/Object.cs : add GType ctor. add RegisterGType.
* glue/type.c (gtksharp_register_type): new GType registrar
* */*.custom : make GType params uints
* sample/Subclass.cs : a simple type registration example
2002-12-24 Alejandro S<>nchez Acosta <raciel@gnome.org>
* samples/tutorial/notebook: Added notebook sample.

1
generator/ObjectGen.cs
View file

@ -190,6 +190,7 @@ namespace GtkSharp.Generation {
sw.WriteLine("\t\t\tDispose();");
sw.WriteLine("\t\t}");
sw.WriteLine();
sw.WriteLine("\t\tprotected " + Name + "(uint gtype) : base(gtype) {}");
sw.WriteLine("\t\tpublic " + Name + "(IntPtr raw) : base(raw) {}");
sw.WriteLine();

2
generator/SymbolTable.cs
View file

@ -53,7 +53,7 @@ namespace GtkSharp.Generation {
simple_types.Add ("gunichar", "string");
simple_types.Add ("uint1", "bool");
simple_types.Add ("GPtrArray", "System.IntPtr[]");
simple_types.Add ("GType", "int");
simple_types.Add ("GType", "uint");
simple_types.Add ("GError", "IntPtr");
// gsize is a system-specific typedef in glibconfig.h,
// but this should work for now

34
glib/Object.cs
View file

@ -10,8 +10,15 @@ namespace GLib {
using System;
using System.Collections;
using System.ComponentModel;
using System.Reflection;
using System.Runtime.InteropServices;
[AttributeUsage(AttributeTargets.All)]
public class WrapperClassAttribute : Attribute {
public WrapperClassAttribute () : base () {}
}
/// <summary>
/// Object Class
/// </summary>
@ -131,6 +138,23 @@ namespace GLib {
return GtkSharp.ObjectManager.CreateObject(o);
}
[DllImport("gtksharpglue")]
static extern uint gtksharp_register_type (string name, uint parent_type);
public static uint RegisterGType (Type t)
{
Type parent = t.BaseType;
PropertyInfo pi = parent.GetProperty ("GType", BindingFlags.DeclaredOnly | BindingFlags.Static | BindingFlags.Public);
if (pi == null) {
Console.WriteLine ("null PropertyInfo");
return 0;
}
uint parent_gtype = (uint) pi.GetValue (null, null);
string name = t.Namespace + t.Name;
GtkSharp.ObjectManager.RegisterType (name, t.Namespace + t.Name, t.Assembly.GetName().Name);
return gtksharp_register_type (name, parent_gtype);
}
/// <summary>
/// Object Constructor
/// </summary>
@ -156,6 +180,14 @@ namespace GLib {
Raw = raw;
}
[DllImport("gobject-2.0")]
static extern IntPtr g_object_new (uint gtype, IntPtr dummy);
public Object (uint gtype)
{
Raw = g_object_new (gtype, IntPtr.Zero);
}
/// <summary>
/// Raw Property
/// </summary>
@ -190,7 +222,7 @@ namespace GLib {
/// The type associated with this object class.
/// </remarks>
[DllImport("libgtksharpglue.so")]
[DllImport("gtksharpglue")]
private static extern uint gtksharp_get_type_id (IntPtr obj);
public static uint GType {

15
glue/type.c
View file

@ -6,6 +6,7 @@
*/
#include <glib-object.h>
#include <stdio.h>
gchar *
gtksharp_get_type_name (GObject *obj)
@ -36,3 +37,17 @@ gtksharp_get_type_name_for_id (GType typ)
{
return g_type_name (typ);
}
GType
gtksharp_register_type (gchar *name, GType parent)
{
GTypeQuery query;
GTypeInfo info = {0, NULL, NULL, NULL, NULL, NULL, 0, 0, NULL, NULL };
g_type_query (parent, &query);
info.class_size = query.class_size;
info.instance_size = query.instance_size;
return g_type_register_static (parent, name, &info, 0);
}

2
gnome/CanvasGroup.custom
View file

@ -8,7 +8,7 @@
// This code is inserted after the automatically generated code.
//
protected CanvasGroup (Gnome.CanvasGroup group, int type) : base (group, type)
protected CanvasGroup (Gnome.CanvasGroup group, uint type) : base (group, type)
{
}

4
gnome/CanvasItem.custom
View file

@ -10,9 +10,9 @@
[DllImport("gnomecanvas-2")]
static extern System.IntPtr gnome_canvas_item_new (IntPtr group, int type, IntPtr null_terminator);
static extern System.IntPtr gnome_canvas_item_new (IntPtr group, uint type, IntPtr null_terminator);
public CanvasItem (Gnome.CanvasGroup group, int type)
public CanvasItem (Gnome.CanvasGroup group, uint type)
: base (gnome_canvas_item_new (group.Handle, type, IntPtr.Zero))
{
}

2
gnome/CanvasRE.custom
View file

@ -8,7 +8,7 @@
// This code is inserted after the automatically generated code.
//
protected CanvasRE (Gnome.CanvasGroup group, int type) : base (group, type)
protected CanvasRE (Gnome.CanvasGroup group, uint type) : base (group, type)
{
}

2
gnome/CanvasShape.custom
View file

@ -8,7 +8,7 @@
// This code is inserted after the automatically generated code.
//
protected CanvasShape (Gnome.CanvasGroup group, int type) : base (group, type)
protected CanvasShape (Gnome.CanvasGroup group, uint type) : base (group, type)
{
}

2
gtk/ListStore.custom
View file

@ -30,7 +30,7 @@
return ret;
}
public void SetColumnTypes (params int[] types)
public void SetColumnTypes (params uint[] types)
{
SetColumnTypes (types.Length, types);
}

2
gtk/TreeStore.custom
View file

@ -110,7 +110,7 @@
return ret;
}
public void SetColumnTypes (params int[] types)
public void SetColumnTypes (params uint[] types)
{
SetColumnTypes (types.Length, types);
}

5
sample/Makefile.in
View file

@ -18,7 +18,7 @@ windows:
$(CSC) /unsafe /out:gtk-hello-world.exe /r:../glib/glib-sharp.dll /r:../gtk/gtk-sharp.dll /r:../gdk/gdk-sharp.dll HelloWorld.cs
$(CSC) /unsafe /out:button.exe /r:../glib/glib-sharp.dll /r:../gtk/gtk-sharp.dll ButtonApp.cs
linux: gtk-hello-world.exe button.exe menu.exe size.exe scribble.exe treeviewdemo.exe $(GNOME_TARGETS) $(GLADE_TARGETS)
linux: gtk-hello-world.exe button.exe subclass.exe menu.exe size.exe scribble.exe treeviewdemo.exe $(GNOME_TARGETS) $(GLADE_TARGETS)
@ENABLE_GNOME_TRUE@ $(MAKE) -C gconf
gtk-hello-world.exe: HelloWorld.cs
@ -36,6 +36,9 @@ fifteen.exe: Fifteen.cs
button.exe: ButtonApp.cs
$(MCS) --unsafe -o button.exe $(local_paths) $(all_assemblies) ButtonApp.cs
subclass.exe: Subclass.cs
$(MCS) --unsafe -o subclass.exe $(local_paths) $(all_assemblies) Subclass.cs
menu.exe: Menu.cs
$(MCS) --unsafe -o menu.exe $(local_paths) $(all_assemblies) Menu.cs

58
sample/Subclass.cs Executable file
View file

@ -0,0 +1,58 @@
// Subclass.cs - Widget subclass Test implementation
//
// Author: Mike Kestner <mkestner@speakeasy.net>
//
// (c) 2001-2002 Mike Kestner
namespace GtkSamples {
using Gtk;
using GtkSharp;
using System;
using System.Drawing;
public class ButtonApp {
public static int Main (string[] args)
{
Application.Init ();
Window win = new Window ("Button Tester");
win.DefaultSize = new Size (200, 150);
win.DeleteEvent += new DeleteEventHandler (Window_Delete);
Button btn = new MyButton ();
btn.Label = "I'm a subclassed button";
btn.Clicked += new EventHandler (btn_click);
win.Add (btn);
win.ShowAll ();
Application.Run ();
return 0;
}
static void btn_click (object obj, EventArgs args)
{
Console.WriteLine ("Button Clicked");
}
static void Window_Delete (object obj, DeleteEventArgs args)
{
Application.Quit ();
args.RetVal = true;
}
}
public class MyButton : Gtk.Button {
static uint gtype = 0;
public MyButton () : base (GType) {}
public static new uint GType {
get {
if (gtype == 0)
gtype = RegisterGType (typeof (MyButton));
return gtype;
}
}
}
}