[rep-gtk] basic support for GQuark type



commit 2901015788d0163a22d81e1b62b291334daf7113
Author: chrisb <zanghar freenet de>
Date:   Sat Aug 1 17:12:05 2009 +0200

    basic support for GQuark type

 ChangeLog    |    3 +++
 build-gtk.jl |   14 +++++++++-----
 glib.defs    |    2 +-
 gtk.defs     |   15 +++++++--------
 4 files changed, 20 insertions(+), 14 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index d0fa4eb..e72c516 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2009-08-01  Christopher Bratusek <zanghar freenet de>
+	* build-gtk.jl: define-type GQuark (basic)
+
 2009-07-31  Christopher Bratusek <zanghar freenet de>
 	* rep-gtk.c
 	* rep-gtk.h
diff --git a/build-gtk.jl b/build-gtk.jl
index e9a90c0..b51673d 100644
--- a/build-gtk.jl
+++ b/build-gtk.jl
@@ -6,12 +6,12 @@
 ;;; it under the terms of the GNU General Public License as published by
 ;;; the Free Software Foundation; either version 2, or (at your option)
 ;;; any later version.
-;;; 
+;;;
 ;;; This program is distributed in the hope that it will be useful,
 ;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;;; GNU General Public License for more details.
-;;; 
+;;;
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with this software; see the file COPYING.  If not, write to
 ;;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
@@ -840,7 +840,7 @@
     (output-helper inner-type standard-output)
     (@ "sgtk_rep_to_%s \(%s, _sgtk_helper_fromrep_%s\)"
        outer-type rep-var inner-type)))
-       
+
 (defun output-list-to-rep (output type gtk-var typage)
   (declare (unused typage))
   (let
@@ -950,7 +950,7 @@
 	  (setq tem (cdr tem))
 	  (setq i (1+ i)))
 	(@ "\n")))
-    
+
     ;; output arg checks and conversions
     (let
 	((tem args)
@@ -1018,7 +1018,7 @@
 	      (@ ";\n"))) args)
     (when args
       (@ "\n"))
-    
+
     (if function-callback
 	(funcall function-callback output)
       ;; output call
@@ -1245,6 +1245,7 @@
 ;; XXX fix the validation functions
 (define-type 'short "short" "sgtk_rep_to_int" "sgtk_int_to_rep"
 	     "sgtk_valid_int" '(listable . t))
+
 (define-type 'ushort "gushort" "sgtk_rep_to_uint" "sgtk_uint_to_rep"
 	     "sgtk_valid_uint" '(listable . t))
 
@@ -1254,6 +1255,9 @@
 (define-type 'uint "guint" "sgtk_rep_to_uint" "sgtk_uint_to_rep"
 	     "sgtk_valid_uint" '(listable . t))
 
+(define-type 'GQuark "guint" "sgtk_rep_to_uint" "sgtk_uint_to_rep"
+	     "sgtk_valid_uint" '(listable . t))
+
 (define-type 'long "glong" "sgtk_rep_to_long"
 	     "sgtk_long_to_rep" "sgtk_valid_long")
 
diff --git a/glib.defs b/glib.defs
index 4fef84f..47d1eea 100644
--- a/glib.defs
+++ b/glib.defs
@@ -1,4 +1,4 @@
-;; -*- scheme -*-
+;; -*- lisp -*-
 
 ;;; GLib defs
 
diff --git a/gtk.defs b/gtk.defs
index 2611dfa..931c12a 100644
--- a/gtk.defs
+++ b/gtk.defs
@@ -484,14 +484,13 @@
    (uint key)
    (GdkModifierType modifier)))
 
-;; XXX GQuark not supported
-;(define-func gtk_accel_group_activate
-;  bool
-;  ((GtkAccelGroup group)
-;   (GQuark quark)
-;   (GObject acceleratable)
-;   (uint key)
-;   (GdkModifierType modifier)))
+(define-func gtk_accel_group_activate
+  bool
+  ((GtkAccelGroup group)
+   (GQuark quark)
+   (GObject acceleratable)
+   (uint key)
+   (GdkModifierType modifier)))
 
 (define-func gtk_accel_groups_activate
   bool



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