[gtk+/gestures: 39/140] Add: GTK_PHASE_NONE value to GtkCapturePhase.



commit 1361165cabc0481d3352b35eee4ce34dc4c7b76d
Author: Carlos Garnacho <carlosg gnome org>
Date:   Mon Mar 24 13:19:53 2014 +0100

    Add: GTK_PHASE_NONE value to GtkCapturePhase.
    
    Gestures attached with this phase will expect callers to have it
    receive events through gtk_event_controller_handle_event(), but
    the gesture will still be notified of sequence state changes,
    grabs, etc...

 gtk/gtkenums.h  |    1 +
 gtk/gtkwidget.c |    8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/gtk/gtkenums.h b/gtk/gtkenums.h
index eb54825..fdb58f4 100644
--- a/gtk/gtkenums.h
+++ b/gtk/gtkenums.h
@@ -1268,6 +1268,7 @@ typedef enum
 
 typedef enum
 {
+  GTK_PHASE_NONE,
   GTK_PHASE_CAPTURE,
   GTK_PHASE_BUBBLE
 } GtkPropagationPhase;
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index ea28b3e..572f98b 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -16494,8 +16494,8 @@ gtk_widget_add_controller (GtkWidget           *widget,
 
   g_return_if_fail (GTK_IS_WIDGET (widget));
   g_return_if_fail (GTK_IS_EVENT_CONTROLLER (controller));
-  g_return_if_fail (phase == GTK_PHASE_CAPTURE ||
-                    phase == GTK_PHASE_BUBBLE);
+  g_return_if_fail (phase >= GTK_PHASE_NONE &&
+                    phase <= GTK_PHASE_BUBBLE);
 
   priv = widget->priv;
 
@@ -16558,8 +16558,8 @@ gtk_widget_list_controllers (GtkWidget           *widget,
   GList *l, *retval = NULL;
 
   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
-  g_return_val_if_fail (phase == GTK_PHASE_CAPTURE ||
-                        phase == GTK_PHASE_BUBBLE, NULL);
+  g_return_val_if_fail (phase >= GTK_PHASE_NONE &&
+                        phase <= GTK_PHASE_BUBBLE, NULL);
 
   priv = widget->priv;
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]