AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

gtkentry: Call get_*_size() vfuncs unconditionally

Browse Source 
These vfuncs cannot be NULL: implementations are provided by GtkEntry,
and subclasses should not set them to NULL. Instead of conditionalising
the calls to the vfuncs, assert that they’re set and call them
unconditionally.

This prevents the possibility of a subclass setting the vfunc to NULL
and then a gtk_entry_get_*_size() call returning undefined values in its
out variables.

https://bugzilla.gnome.org/show_bug.cgi?id=712760
This commit is contained in:
Philip Withnall 2013-12-02 11:03:28 +00:00
parent 0282714d86
commit 7479133753
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/gtkentry.c
View File

@ -3626,7 +3626,7 @@ get_text_area_size (GtkEntry *entry,
class = GTK_ENTRY_GET_CLASS (entry); class = GTK_ENTRY_GET_CLASS (entry);
if (class->get_text_area_size) g_assert (class->get_text_area_size != NULL);
class->get_text_area_size (entry, x, y, width, height); class->get_text_area_size (entry, x, y, width, height);
} }
@ -3704,7 +3704,7 @@ get_frame_size (GtkEntry *entry,
class = GTK_ENTRY_GET_CLASS (entry); class = GTK_ENTRY_GET_CLASS (entry);
if (class->get_frame_size) g_assert (class->get_frame_size != NULL);
class->get_frame_size (entry, x, y, width, height); class->get_frame_size (entry, x, y, width, height);
if (!relative_to_window) if (!relative_to_window)