diff options
| author | Benjamin Otte <otte@redhat.com> | 2010-07-19 13:24:30 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2010-07-26 16:42:46 +0200 |
| commit | 2883a274cc104aa7d1a1fdc2f5d6c106ab10c6cd (patch) | |
| tree | 700e3c60ff24882090b2afe4a498f857ba11bf3c /gdk/gdkdraw.c | |
| parent | 8adfc326f8f0daf307f7f55c3b4834c57068f84a (diff) | |
| download | gtk+-2883a274cc104aa7d1a1fdc2f5d6c106ab10c6cd.tar.gz | |
gdk: Revert making get_size optional
49a0ec6e95408e3484397602ad46e274cedbf98b added this hunk without
explanations and it's obviously wrong because failing to have a get_size
vfunc will now not set width and height and they'll end up with invalid
values.
In fact, the GdkDrawableImpl{X11,Win32,Quartz} functions do not have
get_size implemented, so the patch was most likely an attempt to work
around calling this function erroneously on the impl objects.
The correct fix is to call impl->wrapper instead.
Diffstat (limited to 'gdk/gdkdraw.c')
| -rw-r--r-- | gdk/gdkdraw.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gdk/gdkdraw.c b/gdk/gdkdraw.c index 78c8dfeeec..8dc121413a 100644 --- a/gdk/gdkdraw.c +++ b/gdk/gdkdraw.c @@ -115,8 +115,7 @@ gdk_drawable_get_size (GdkDrawable *drawable, { g_return_if_fail (GDK_IS_DRAWABLE (drawable)); - if (GDK_DRAWABLE_GET_CLASS (drawable)->get_size != NULL) - GDK_DRAWABLE_GET_CLASS (drawable)->get_size (drawable, width, height); + GDK_DRAWABLE_GET_CLASS (drawable)->get_size (drawable, width, height); } /** |