[gtkmm] Update gdk .defs files.



commit ec1f6c682b799419fab700f938145560b4ecabde
Author: Murray Cumming <murrayc murrayc com>
Date:   Sat Aug 15 14:48:20 2015 +0200

    Update gdk .defs files.

 gdk/src/gdk_enums.defs   |   28 +++++++++++++++++++++++++++-
 gdk/src/gdk_methods.defs |   20 ++++++++++++++++++++
 gdk/src/gdk_signals.defs |    5 +++--
 3 files changed, 50 insertions(+), 3 deletions(-)
---
diff --git a/gdk/src/gdk_enums.defs b/gdk/src/gdk_enums.defs
index 4162ce5..17d5225 100644
--- a/gdk/src/gdk_enums.defs
+++ b/gdk/src/gdk_enums.defs
@@ -384,6 +384,8 @@
 ;;   GDK_TOUCH_UPDATE      = 38,
 ;;   GDK_TOUCH_END         = 39,
 ;;   GDK_TOUCH_CANCEL      = 40,
+;;   GDK_TOUCHPAD_SWIPE    = 41,
+;;   GDK_TOUCHPAD_PINCH    = 42,
 ;;   GDK_EVENT_LAST        /* helper variable for decls */
 ;; } GdkEventType;
 
@@ -434,7 +436,9 @@
     '("touch-update" "GDK_TOUCH_UPDATE" "38")
     '("touch-end" "GDK_TOUCH_END" "39")
     '("touch-cancel" "GDK_TOUCH_CANCEL" "40")
-    '("event-last" "GDK_EVENT_LAST" "41")
+    '("touchpad-swipe" "GDK_TOUCHPAD_SWIPE" "41")
+    '("touchpad-pinch" "GDK_TOUCHPAD_PINCH" "42")
+    '("event-last" "GDK_EVENT_LAST" "43")
   )
 )
 
@@ -459,6 +463,26 @@
 ;; Original typedef:
 ;; typedef enum
 ;; {
+;;   GDK_TOUCHPAD_GESTURE_PHASE_BEGIN,
+;;   GDK_TOUCHPAD_GESTURE_PHASE_UPDATE,
+;;   GDK_TOUCHPAD_GESTURE_PHASE_END,
+;;   GDK_TOUCHPAD_GESTURE_PHASE_CANCEL
+;; } GdkTouchpadGesturePhase;
+
+(define-enum-extended TouchpadGesturePhase
+  (in-module "Gdk")
+  (c-name "GdkTouchpadGesturePhase")
+  (values
+    '("begin" "GDK_TOUCHPAD_GESTURE_PHASE_BEGIN" "0")
+    '("update" "GDK_TOUCHPAD_GESTURE_PHASE_UPDATE" "1")
+    '("end" "GDK_TOUCHPAD_GESTURE_PHASE_END" "2")
+    '("cancel" "GDK_TOUCHPAD_GESTURE_PHASE_CANCEL" "3")
+  )
+)
+
+;; Original typedef:
+;; typedef enum
+;; {
 ;;   GDK_SCROLL_UP,
 ;;   GDK_SCROLL_DOWN,
 ;;   GDK_SCROLL_LEFT,
@@ -1040,6 +1064,7 @@
 ;;   GDK_SCROLL_MASK               = 1 << 21,
 ;;   GDK_TOUCH_MASK                = 1 << 22,
 ;;   GDK_SMOOTH_SCROLL_MASK        = 1 << 23,
+;;   GDK_TOUCHPAD_GESTURE_MASK     = 1 << 24,
 ;;   GDK_ALL_EVENTS_MASK           = 0xFFFFFE
 ;; } GdkEventMask;
 
@@ -1070,6 +1095,7 @@
     '("scroll-mask" "GDK_SCROLL_MASK" "1 << 21")
     '("touch-mask" "GDK_TOUCH_MASK" "1 << 22")
     '("smooth-scroll-mask" "GDK_SMOOTH_SCROLL_MASK" "1 << 23")
+    '("touchpad-gesture-mask" "GDK_TOUCHPAD_GESTURE_MASK" "1 << 24")
     '("all-events-mask" "GDK_ALL_EVENTS_MASK" "0xFFFFFE")
   )
 )
diff --git a/gdk/src/gdk_methods.defs b/gdk/src/gdk_methods.defs
index eb3c386..74d33df 100644
--- a/gdk/src/gdk_methods.defs
+++ b/gdk/src/gdk_methods.defs
@@ -158,6 +158,8 @@
     '("touch-update" "GDK_TOUCH_UPDATE")
     '("touch-end" "GDK_TOUCH_END")
     '("touch-cancel" "GDK_TOUCH_CANCEL")
+    '("touchpad-swipe" "GDK_TOUCHPAD_SWIPE")
+    '("touchpad-pinch" "GDK_TOUCHPAD_PINCH")
     '("event-last" "GDK_EVENT_LAST")
   )
 )
@@ -173,6 +175,18 @@
   )
 )
 
+(define-enum TouchpadGesturePhase
+  (in-module "Gdk")
+  (c-name "GdkTouchpadGesturePhase")
+  (gtype-id "GDK_TYPE_TOUCHPAD_GESTURE_PHASE")
+  (values
+    '("begin" "GDK_TOUCHPAD_GESTURE_PHASE_BEGIN")
+    '("update" "GDK_TOUCHPAD_GESTURE_PHASE_UPDATE")
+    '("end" "GDK_TOUCHPAD_GESTURE_PHASE_END")
+    '("cancel" "GDK_TOUCHPAD_GESTURE_PHASE_CANCEL")
+  )
+)
+
 (define-enum ScrollDirection
   (in-module "Gdk")
   (c-name "GdkScrollDirection")
@@ -511,6 +525,7 @@
     '("scroll-mask" "GDK_SCROLL_MASK")
     '("touch-mask" "GDK_TOUCH_MASK")
     '("smooth-scroll-mask" "GDK_SMOOTH_SCROLL_MASK")
+    '("touchpad-gesture-mask" "GDK_TOUCHPAD_GESTURE_MASK")
     '("all-events-mask" "GDK_ALL_EVENTS_MASK")
   )
 )
@@ -1873,6 +1888,11 @@
   (return-type "GType")
 )
 
+(define-function gdk_touchpad_gesture_phase_get_type
+  (c-name "gdk_touchpad_gesture_phase_get_type")
+  (return-type "GType")
+)
+
 (define-function gdk_scroll_direction_get_type
   (c-name "gdk_scroll_direction_get_type")
   (return-type "GType")
diff --git a/gdk/src/gdk_signals.defs b/gdk/src/gdk_signals.defs
index decdd58..23bd4ef 100644
--- a/gdk/src/gdk_signals.defs
+++ b/gdk/src/gdk_signals.defs
@@ -271,7 +271,7 @@
 (define-property display
   (of-object "GdkGLContext")
   (prop-type "GParamObject")
-  (docs "The GDK display the context is from")
+  (docs "The GDK display used to create the GL context")
   (readable #t)
   (writable #t)
   (construct-only #t)
@@ -289,8 +289,9 @@
 (define-property shared-context
   (of-object "GdkGLContext")
   (prop-type "GParamObject")
-  (docs "The GL context this context share data with")
+  (docs "The GL context this context shares data with")
   (readable #t)
   (writable #t)
   (construct-only #t)
 )
+


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