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

* gtk/CellRenderer.custom: fix GetSize_cb, cell_area can be NULL

Browse source 
coming from Gtk (so can't use ref Gdk.Rectangle, have to use
IntPtr)

svn path=/trunk/gtk-sharp/; revision=28424
This commit is contained in:
Vladimir Vukicevic 2004-05-29 03:09:47 +00:00
parent f68162fb3c
commit 2969801044
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2004-05-28 Vladimir Vukicevic <vladimir@pobox.com>
* gtk/CellRenderer.custom: fix GetSize_cb, cell_area can be NULL
coming from Gtk (so can't use ref Gdk.Rectangle, have to use
IntPtr)
2004-05-28 Miguel de Icaza <miguel@ximian.com>
* Added System.Drawing samples.

15
gtk/CellRenderer.custom
View file

@ -23,14 +23,15 @@
[DllImport("gtksharpglue")]
static extern void gtksharp_cellrenderer_override_get_size (GLib.GType gtype, GetSizeDelegate cb);
delegate void GetSizeDelegate (IntPtr item, IntPtr widget, ref Gdk.Rectangle cell_area, IntPtr x_offset, IntPtr y_offset, IntPtr width, IntPtr height);
delegate void GetSizeDelegate (IntPtr item, IntPtr widget, IntPtr cell_area_ptr, IntPtr x_offset, IntPtr y_offset, IntPtr width, IntPtr height);
static GetSizeDelegate GetSizeCallback;
static void GetSize_cb (IntPtr item, IntPtr widget, ref Gdk.Rectangle cell_area, IntPtr x_offset, IntPtr y_offset, IntPtr width, IntPtr height)
static void GetSize_cb (IntPtr item, IntPtr widget, IntPtr cell_area_ptr, IntPtr x_offset, IntPtr y_offset, IntPtr width, IntPtr height)
{
CellRenderer obj = GLib.Object.GetObject (item, false) as CellRenderer;
Gtk.Widget widg = GLib.Object.GetObject (widget, false) as Gtk.Widget;
Gdk.Rectangle cell_area = Gdk.Rectangle.New (cell_area_ptr);
int a, b, c, d;
obj.OnGetSize (widg, cell_area, out a, out b, out c, out d);
@ -38,12 +39,10 @@
Marshal.WriteInt32 (x_offset, a);
if (y_offset != IntPtr.Zero)
Marshal.WriteInt32 (y_offset, b);
if (!(cell_area.Equals (Gdk.Rectangle.Zero))) {
if (width != IntPtr.Zero)
Marshal.WriteInt32 (width, c);
if (height != IntPtr.Zero)
Marshal.WriteInt32 (height, d);
}
if (width != IntPtr.Zero)
Marshal.WriteInt32 (width, c);
if (height != IntPtr.Zero)
Marshal.WriteInt32 (height, d);
}
protected static void OverrideGetSize (GLib.GType gtype)