Moved some functions from gtk.lisp

diff --git a/gtk/gtkobject.lisp b/gtk/gtkobject.lisp
index b9146ade801c51a79940d4cf6dfa392d47e19093..f56f5a60f5b07f56076d12ef639ffb3de6c6b0a1 100644 (file)
--- a/gtk/gtkobject.lisp
+++ b/gtk/gtkobject.lisp
@@ -15,7 +15,7 @@
 ;; License along with this library; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-;; $Id: gtkobject.lisp,v 1.3 2000-08-16 17:30:36 espen Exp $
+;; $Id: gtkobject.lisp,v 1.4 2000-08-16 22:16:23 espen Exp $
 
 
 (in-package "GTK")
@@ -252,12 +252,14 @@ (after-gc-hook)
 
 
 
-;;;; Main loop
+;;;; Main loop, timeouts and idle functions
 
 (declaim (inline events-pending-p main-iteration))
 
 (define-foreign ("gtk_events_pending" events-pending-p) () boolean)
 
+(define-foreign get-current-event () gdk:event)
+
 (define-foreign main-do-event () nil
   (event gdk:event))
 
@@ -277,6 +279,29 @@ (defun main-iterate-all (&rest args)
     (main-iteration nil)
     (main-iterate-all)))
 
+(define-foreign ("gtk_timeout_add_full" timeout-add)
+    (interval function) unsigned-int
+  (interval (unsigned 32))
+  (0 unsigned-long)
+  (*callback-marshal* pointer)
+  ((register-callback-function function) unsigned-long)
+  (*destroy-marshal* pointer))
+
+(define-foreign timeout-remove () nil
+  (timeout-handler-id unsigned-int))
+  
+(define-foreign ("gtk_idle_add_full" idle-add)
+    (function &optional (priority 200)) unsigned-int
+  (priority int)
+  (0 unsigned-long)
+  (*callback-marshal* pointer)
+  ((register-callback-function function) unsigned-long)
+  (*destroy-marshal* pointer))
+
+(define-foreign idle-remove () nil
+  (idle-handler-id unsigned-int))
+
+
 (system:add-fd-handler (gdk:event-poll-fd) :input #'main-iterate-all)
 (setq lisp::*periodic-polling-function* #'main-iterate-all)
 (setq lisp::*max-event-to-sec* 0)

diff --git a/gtk/gtkwidget.lisp b/gtk/gtkwidget.lisp
index 8d185731887d75d4920d5373351c69e765db8279..6097a2f1c29c9ce901c4645ea9599cf00e213c72 100644 (file)
--- a/gtk/gtkwidget.lisp
+++ b/gtk/gtkwidget.lisp
@@ -15,7 +15,7 @@
 ;; License along with this library; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-;; $Id: gtkwidget.lisp,v 1.1 2000-08-14 16:45:02 espen Exp $
+;; $Id: gtkwidget.lisp,v 1.2 2000-08-16 22:16:44 espen Exp $
 
 (in-package "GTK")
 
@@ -253,6 +253,9 @@ (define-foreign widget-event () int
   (widget widget)
   (event gdk:event))
 
+(define-foreign get-event-widget () widget
+  (event gdk:event))
+
 (define-foreign widget-activate () boolean
   (widget widget))
 
@@ -276,7 +279,14 @@ (define-foreign widget-grab-focus () nil
 (define-foreign widget-grab-default () nil
   (widget widget))
 
-;; cl-gtk.c
+(define-foreign grab-add () nil
+  (widget widget))
+
+(define-foreign grab-get-current () widget)
+
+(define-foreign grab-remove () nil
+  (widget widget))
+
 (define-foreign widget-allocation () nil
   (widget widget)
   (width int :out)
@@ -387,7 +397,7 @@ (define-foreign widget-shape-combine-mask () nil
   (x-offset int)
   (y-offset int))
 
-;; cl-gtk.c
+;; defined in gtkglue.c
 (define-foreign widget-mapped-p () boolean
   (widget widget))