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

Don't assert in gtk_event_controller_constructed

Browse Source 
This prevents some of our generic object implementation tests
from working with gesture objects. Instead, add g_return_if_fail
checks in all the gesture constructors.
This commit is contained in:
Matthias Clasen 2014-05-27 14:30:47 -04:00
parent e4680d64a0
commit 3bb404f40c
7 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gtk/gtkeventcontroller.c
View File

@ -115,8 +115,8 @@ gtk_event_controller_constructed (GObject *object)
GtkEventControllerPrivate *priv; GtkEventControllerPrivate *priv;
priv = gtk_event_controller_get_instance_private (controller); priv = gtk_event_controller_get_instance_private (controller);
g_assert (priv->widget != NULL); if (priv->widget)
_gtk_widget_add_controller (priv->widget, controller); _gtk_widget_add_controller (priv->widget, controller);
} }
static void static void
@ -126,7 +126,8 @@ gtk_event_controller_dispose (GObject *object)
GtkEventControllerPrivate *priv; GtkEventControllerPrivate *priv;
priv = gtk_event_controller_get_instance_private (controller); priv = gtk_event_controller_get_instance_private (controller);
_gtk_widget_remove_controller (priv->widget, controller); if (priv->widget)
_gtk_widget_remove_controller (priv->widget, controller);
} }
static void static void

2
gtk/gtkgesturedrag.c
View File

@ -186,6 +186,8 @@ gtk_gesture_drag_init (GtkGestureDrag *gesture)
GtkGesture * GtkGesture *
gtk_gesture_drag_new (GtkWidget *widget) gtk_gesture_drag_new (GtkWidget *widget)
{ {
g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
return g_object_new (GTK_TYPE_GESTURE_DRAG, return g_object_new (GTK_TYPE_GESTURE_DRAG,
"widget", widget, "widget", widget,
NULL); NULL);

2
gtk/gtkgesturelongpress.c
View File

@ -262,6 +262,8 @@ gtk_gesture_long_press_class_init (GtkGestureLongPressClass *klass)
GtkGesture * GtkGesture *
gtk_gesture_long_press_new (GtkWidget *widget) gtk_gesture_long_press_new (GtkWidget *widget)
{ {
g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
return g_object_new (GTK_TYPE_GESTURE_LONG_PRESS, return g_object_new (GTK_TYPE_GESTURE_LONG_PRESS,
"widget", widget, "widget", widget,
NULL); NULL);

2
gtk/gtkgesturemultipress.c
View File

@ -384,6 +384,8 @@ gtk_gesture_multi_press_init (GtkGestureMultiPress *gesture)
GtkGesture * GtkGesture *
gtk_gesture_multi_press_new (GtkWidget *widget) gtk_gesture_multi_press_new (GtkWidget *widget)
{ {
g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
return g_object_new (GTK_TYPE_GESTURE_MULTI_PRESS, return g_object_new (GTK_TYPE_GESTURE_MULTI_PRESS,
"widget", widget, "widget", widget,
NULL); NULL);

2
gtk/gtkgesturerotate.c
View File

@ -188,6 +188,8 @@ gtk_gesture_rotate_class_init (GtkGestureRotateClass *klass)
GtkGesture * GtkGesture *
gtk_gesture_rotate_new (GtkWidget *widget) gtk_gesture_rotate_new (GtkWidget *widget)
{ {
g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
return g_object_new (GTK_TYPE_GESTURE_ROTATE, return g_object_new (GTK_TYPE_GESTURE_ROTATE,
"widget", widget, "widget", widget,
NULL); NULL);

2
gtk/gtkgestureswipe.c
View File

@ -237,6 +237,8 @@ gtk_gesture_swipe_init (GtkGestureSwipe *gesture)
GtkGesture * GtkGesture *
gtk_gesture_swipe_new (GtkWidget *widget) gtk_gesture_swipe_new (GtkWidget *widget)
{ {
g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
return g_object_new (GTK_TYPE_GESTURE_SWIPE, return g_object_new (GTK_TYPE_GESTURE_SWIPE,
"widget", widget, "widget", widget,
NULL); NULL);

2
gtk/gtkgesturezoom.c
View File

@ -181,6 +181,8 @@ gtk_gesture_zoom_class_init (GtkGestureZoomClass *klass)
GtkGesture * GtkGesture *
gtk_gesture_zoom_new (GtkWidget *widget) gtk_gesture_zoom_new (GtkWidget *widget)
{ {
g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
return g_object_new (GTK_TYPE_GESTURE_ZOOM, return g_object_new (GTK_TYPE_GESTURE_ZOOM,
"widget", widget, "widget", widget,
NULL); NULL);