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

notebook: Drop use of G_DISABLE_CHECKS

Browse Source 
Rewrite the one check that the G_DISABLE_CHECKS macro was used for
in terms of g_return_if_fail.
This commit is contained in:
Matthias Clasen 2015-09-08 20:55:32 -04:00
parent ff530ae321
commit f4b53d4b0c
1 changed files with 30 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
gtk/gtknotebook.c
View File

@ -278,13 +278,6 @@ static const GtkTargetEntry notebook_targets [] = {
{ "GTK_NOTEBOOK_TAB", GTK_TARGET_SAME_APP, 0 }, { "GTK_NOTEBOOK_TAB", GTK_TARGET_SAME_APP, 0 },
}; };
#ifdef G_DISABLE_CHECKS
#define CHECK_FIND_CHILD(notebook, child) \
gtk_notebook_find_child (notebook, child, G_STRLOC)
#else
#define CHECK_FIND_CHILD(notebook, child) \
gtk_notebook_find_child (notebook, child, NULL)
#endif
/*** GtkNotebook Methods ***/ /*** GtkNotebook Methods ***/
static gboolean gtk_notebook_select_page (GtkNotebook *notebook, static gboolean gtk_notebook_select_page (GtkNotebook *notebook,
@ -451,8 +444,7 @@ static void gtk_notebook_set_scroll_timer (GtkNotebook *notebook);
static gint gtk_notebook_page_compare (gconstpointer a, static gint gtk_notebook_page_compare (gconstpointer a,
gconstpointer b); gconstpointer b);
static GList* gtk_notebook_find_child (GtkNotebook *notebook, static GList* gtk_notebook_find_child (GtkNotebook *notebook,
GtkWidget *child, GtkWidget *child);
const gchar *function);
static GList * gtk_notebook_search_page (GtkNotebook *notebook, static GList * gtk_notebook_search_page (GtkNotebook *notebook,
GList *list, GList *list,
gint direction, gint direction,
@ -4086,7 +4078,7 @@ gtk_notebook_set_child_property (GtkContainer *container,
gboolean fill; gboolean fill;
/* not finding child's page is valid for menus or labels */ /* not finding child's page is valid for menus or labels */
if (!gtk_notebook_find_child (GTK_NOTEBOOK (container), child, NULL)) if (!gtk_notebook_find_child (GTK_NOTEBOOK (container), child))
return; return;
switch (property_id) switch (property_id)
@ -4149,7 +4141,7 @@ gtk_notebook_get_child_property (GtkContainer *container,
gboolean fill; gboolean fill;
/* not finding child's page is valid for menus or labels */ /* not finding child's page is valid for menus or labels */
list = gtk_notebook_find_child (notebook, child, NULL); list = gtk_notebook_find_child (notebook, child);
if (!list) if (!list)
{ {
/* nothing to set on labels or menus */ /* nothing to set on labels or menus */
@ -4523,7 +4515,7 @@ gtk_notebook_set_focus_child (GtkContainer *container,
{ {
if (gtk_widget_get_parent (page_child) == GTK_WIDGET (container)) if (gtk_widget_get_parent (page_child) == GTK_WIDGET (container))
{ {
GList *list = gtk_notebook_find_child (notebook, page_child, NULL); GList *list = gtk_notebook_find_child (notebook, page_child);
if (list != NULL) if (list != NULL)
{ {
GtkNotebookPage *page = list->data; GtkNotebookPage *page = list->data;
@ -5002,20 +4994,11 @@ gtk_notebook_page_compare (gconstpointer a,
static GList* static GList*
gtk_notebook_find_child (GtkNotebook *notebook, gtk_notebook_find_child (GtkNotebook *notebook,
GtkWidget *child, GtkWidget *child)
const gchar *function)
{ {
GtkNotebookPrivate *priv = notebook->priv; return g_list_find_custom (notebook->priv->children,
GList *list = g_list_find_custom (priv->children, child, child,
gtk_notebook_page_compare); gtk_notebook_page_compare);
#ifndef G_DISABLE_CHECKS
if (!list && function)
g_warning ("%s: unable to find child %p in notebook %p",
function, child, notebook);
#endif
return list;
} }
static void static void
@ -6750,7 +6733,7 @@ gtk_notebook_real_switch_page (GtkNotebook *notebook,
guint page_num) guint page_num)
{ {
GtkNotebookPrivate *priv = notebook->priv; GtkNotebookPrivate *priv = notebook->priv;
GList *list = gtk_notebook_find_child (notebook, GTK_WIDGET (child), NULL); GList *list = gtk_notebook_find_child (notebook, GTK_WIDGET (child));
GtkNotebookPage *page = GTK_NOTEBOOK_PAGE (list); GtkNotebookPage *page = GTK_NOTEBOOK_PAGE (list);
gboolean child_has_focus; gboolean child_has_focus;
@ -7833,9 +7816,8 @@ gtk_notebook_get_tab_label (GtkNotebook *notebook,
g_return_val_if_fail (GTK_IS_NOTEBOOK (notebook), NULL); g_return_val_if_fail (GTK_IS_NOTEBOOK (notebook), NULL);
g_return_val_if_fail (GTK_IS_WIDGET (child), NULL); g_return_val_if_fail (GTK_IS_WIDGET (child), NULL);
list = CHECK_FIND_CHILD (notebook, child); list = gtk_notebook_find_child (notebook, child);
if (!list) g_return_val_if_fail (list != NULL, NULL);
return NULL;
if (GTK_NOTEBOOK_PAGE (list)->default_tab) if (GTK_NOTEBOOK_PAGE (list)->default_tab)
return NULL; return NULL;
@ -7868,9 +7850,8 @@ gtk_notebook_set_tab_label (GtkNotebook *notebook,
priv = notebook->priv; priv = notebook->priv;
list = CHECK_FIND_CHILD (notebook, child); list = gtk_notebook_find_child (notebook, child);
if (!list) g_return_if_fail (list != NULL);
return;
/* a NULL pointer indicates a default_tab setting, otherwise /* a NULL pointer indicates a default_tab setting, otherwise
* we need to set the associated label * we need to set the associated label
@ -8003,9 +7984,8 @@ gtk_notebook_get_menu_label (GtkNotebook *notebook,
g_return_val_if_fail (GTK_IS_NOTEBOOK (notebook), NULL); g_return_val_if_fail (GTK_IS_NOTEBOOK (notebook), NULL);
g_return_val_if_fail (GTK_IS_WIDGET (child), NULL); g_return_val_if_fail (GTK_IS_WIDGET (child), NULL);
list = CHECK_FIND_CHILD (notebook, child); list = gtk_notebook_find_child (notebook, child);
if (!list) g_return_val_if_fail (list != NULL, NULL);
return NULL;
if (GTK_NOTEBOOK_PAGE (list)->default_menu) if (GTK_NOTEBOOK_PAGE (list)->default_menu)
return NULL; return NULL;
@ -8035,9 +8015,8 @@ gtk_notebook_set_menu_label (GtkNotebook *notebook,
priv = notebook->priv; priv = notebook->priv;
list = CHECK_FIND_CHILD (notebook, child); list = gtk_notebook_find_child (notebook, child);
if (!list) g_return_if_fail (list != NULL);
return;
page = list->data; page = list->data;
if (page->menu_label) if (page->menu_label)
@ -8158,9 +8137,8 @@ gtk_notebook_set_tab_label_packing (GtkNotebook *notebook,
priv = notebook->priv; priv = notebook->priv;
list = CHECK_FIND_CHILD (notebook, child); list = gtk_notebook_find_child (notebook, child);
if (!list) g_return_if_fail (list != NULL);
return;
page = list->data; page = list->data;
expand = expand != FALSE; expand = expand != FALSE;
@ -8190,7 +8168,7 @@ gtk_notebook_query_tab_label_packing (GtkNotebook *notebook,
g_return_if_fail (GTK_IS_NOTEBOOK (notebook)); g_return_if_fail (GTK_IS_NOTEBOOK (notebook));
g_return_if_fail (GTK_IS_WIDGET (child)); g_return_if_fail (GTK_IS_WIDGET (child));
list = CHECK_FIND_CHILD (notebook, child); list = gtk_notebook_find_child (notebook, child);
g_return_if_fail (list != NULL); g_return_if_fail (list != NULL);
if (expand) if (expand)
@ -8227,9 +8205,8 @@ gtk_notebook_reorder_child (GtkNotebook *notebook,
priv = notebook->priv; priv = notebook->priv;
list = CHECK_FIND_CHILD (notebook, child); list = gtk_notebook_find_child (notebook, child);
if (!list) g_return_if_fail (list != NULL);
return;
max_pos = g_list_length (priv->children) - 1; max_pos = g_list_length (priv->children) - 1;
if (position < 0 || position > max_pos) if (position < 0 || position > max_pos)
@ -8349,9 +8326,8 @@ gtk_notebook_get_tab_reorderable (GtkNotebook *notebook,
g_return_val_if_fail (GTK_IS_NOTEBOOK (notebook), FALSE); g_return_val_if_fail (GTK_IS_NOTEBOOK (notebook), FALSE);
g_return_val_if_fail (GTK_IS_WIDGET (child), FALSE); g_return_val_if_fail (GTK_IS_WIDGET (child), FALSE);
list = CHECK_FIND_CHILD (notebook, child); list = gtk_notebook_find_child (notebook, child);
if (!list) g_return_val_if_fail (list != NULL, FALSE);
return FALSE;
return GTK_NOTEBOOK_PAGE (list)->reorderable; return GTK_NOTEBOOK_PAGE (list)->reorderable;
} }
@ -8377,9 +8353,8 @@ gtk_notebook_set_tab_reorderable (GtkNotebook *notebook,
g_return_if_fail (GTK_IS_NOTEBOOK (notebook)); g_return_if_fail (GTK_IS_NOTEBOOK (notebook));
g_return_if_fail (GTK_IS_WIDGET (child)); g_return_if_fail (GTK_IS_WIDGET (child));
list = CHECK_FIND_CHILD (notebook, child); list = gtk_notebook_find_child (notebook, child);
if (!list) g_return_if_fail (list != NULL);
return;
reorderable = reorderable != FALSE; reorderable = reorderable != FALSE;
@ -8410,9 +8385,8 @@ gtk_notebook_get_tab_detachable (GtkNotebook *notebook,
g_return_val_if_fail (GTK_IS_NOTEBOOK (notebook), FALSE); g_return_val_if_fail (GTK_IS_NOTEBOOK (notebook), FALSE);
g_return_val_if_fail (GTK_IS_WIDGET (child), FALSE); g_return_val_if_fail (GTK_IS_WIDGET (child), FALSE);
list = CHECK_FIND_CHILD (notebook, child); list = gtk_notebook_find_child (notebook, child);
if (!list) g_return_val_if_fail (list != NULL, FALSE);
return FALSE;
return GTK_NOTEBOOK_PAGE (list)->detachable; return GTK_NOTEBOOK_PAGE (list)->detachable;
} }
@ -8480,9 +8454,8 @@ gtk_notebook_set_tab_detachable (GtkNotebook *notebook,
g_return_if_fail (GTK_IS_NOTEBOOK (notebook)); g_return_if_fail (GTK_IS_NOTEBOOK (notebook));
g_return_if_fail (GTK_IS_WIDGET (child)); g_return_if_fail (GTK_IS_WIDGET (child));
list = CHECK_FIND_CHILD (notebook, child); list = gtk_notebook_find_child (notebook, child);
if (!list) g_return_if_fail (list != NULL);
return;
detachable = detachable != FALSE; detachable = detachable != FALSE;