Fix for CLISP

[clg] / gtk / gtk.lisp

diff --git a/gtk/gtk.lisp b/gtk/gtk.lisp
index 7d98710c41a8b086bfcac2c7bbd4b4e320d3a4e2..0f2d37e4b716ba53e633ca0de4b51e8dde2ca75c 100644 (file)
--- a/gtk/gtk.lisp
+++ b/gtk/gtk.lisp
@@ -20,7 +20,7 @@
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-;; $Id: gtk.lisp,v 1.81 2007-07-12 13:55:59 espen Exp $
+;; $Id: gtk.lisp,v 1.85 2007-11-01 15:05:00 espen Exp $
 
 
 (in-package "GTK")
@@ -187,12 +187,12 @@   (defun %init-multi-threaded-event-handling (display)
           (find-package "SWANK")
           (not (eq (symbol-value (find-symbol "*COMMUNICATION-STYLE*" "SWANK")) :spawn)))
       (error "When running clg in Slime, the communication style :spawn must be used in combination with multi threaded event handling. See the README file and <http://common-lisp.net/project/slime/doc/html/slime_45.html> for more information."))
+    (gdk:threads-init)  
     (let ((main-running (sb-thread:make-waitqueue)))
       (gdk:with-global-lock
        (setf *main-thread*
         (sb-thread:make-thread 
         #'(lambda () 
-            (gdk:threads-init)  
             (gdk:with-global-lock 
               (gdk:display-open display)
               #+win32(gdk:timeout-add-with-lock (/ *event-poll-interval* 1000)
@@ -206,8 +206,8 @@   (defun %init-multi-threaded-event-handling (display)
     ;; This will *only* protect code entered directly in the REPL.
     (when (find-package "SWANK")
       (push #'(lambda (form) 
-               (within-main-loop (eval form)))
-       swank::*slime-repl-eval-hooks*))))
+               (within-main-loop (eval form)))
+       (symbol-value (find-symbol "*SLIME-REPL-EVAL-HOOKS*" "SWANK"))))))
 
 #-sb-thread
 (defmacro within-main-loop (&body body)
@@ -552,7 +552,7 @@   (defun assistant-prepend-page (assistant page &rest child-args)
   (define-callback-marshal %assistant-page-func-callback int
     ((current-page int)))
 
-  (defbinding assistant-set-forward-func (assistant function) nil
+  (defbinding assistant-set-forward-page-func (assistant function) nil
     (assistant assistant)
     (%assistant-page-func-callback callback)
     ((register-callback-function function) pointer-data)
@@ -876,6 +876,7 @@ (defun dialog-add-action-widget (dialog widget &optional (response widget)
     (when (functionp response)
        (signal-connect dialog signal response :object object :after after))
     (when default
+      (setf (widget-can-default-p widget) t)
       (%dialog-set-default-response dialog id))
     widget))
 
@@ -2503,9 +2504,46 @@   (defbinding (stock-set-translate-function "gtk_stock_set_translate_func")
     ((register-callback-function function) unsigned-int)
     (user-data-destroy-callback callback)))
 
+
+;;; Tooltip
+
+;; #?-(pkg-exists-p "gtk+-2.0" :atleast-version "2.12.0")
+;; (progn
+;;   (defbinding %tooltip-set-markup () nil
+;;     tooltip
+;;     (markup string))
+
+;;   (defbinding %tooltip-set-text () nil
+;;     tooltip
+;;     (text string))
+
+;;   (defbinding %tooltip-set-icon () nil
+;;     tooltip
+;;     (icon gdk:pixbuf))
+
+;;   (defbinding %tooltip-set-from-stock-icon () nil
+;;     tooltip
+;;     (stock-id string)
+;;     icon-size)
+
+;;   (defbinding %tooltip-set-custom () nil
+;;     tooltip
+;;     widget)
+
+;;   (defun tooltip-set (tooltip value &key (markup t) (icon-size :button))
+;;     (etypecase value
+;;       (string (if markup
+;;               (tooltip-set-markup tooltip value)
+;;             (tooltip-set-text tooltip value)))
+;;       (pixbuf (tooltip-set-icon tooltip value))
+;;       (keyword (tooltip-set-icon-from-stock tooltip value icon-size))
+      
   
 
-;;; Tooltips
+;;; Tooltips 
+
+;; GtkTooltips has been deprecated in favor of the new tooltip API
+;; introduced in in GTK+ 2.12
 
 (defbinding tooltips-enable () nil
   (tooltips tooltips))
@@ -2601,8 +2639,6 @@ (defmethod allocate-foreign ((plug plug) &key id)
   (%plug-new (or id 0)))
 
 
-;;;; New stuff in Gtk+ 2.10
-
 ;;; Link button
 
 #?(pkg-exists-p "gtk+-2.0" :atleast-version "2.10.0")
@@ -2613,3 +2649,64 @@   (defbinding link-button-set-uri-hook (function) pointer
     (%link-button-uri-callback callback)
     ((register-callback-function function) unsigned-int)
     (user-data-destroy-callback callback)))
+
+
+;;; Builder
+
+#?(pkg-exists-p "gtk+-2.0" :atleast-version "2.12.0")
+(progn
+  (defmethod initialize-instance ((builder builder) &key interface 
+                                 (connect-signals t) (package *package*))
+    (call-next-method)
+    (etypecase interface
+      (null)
+      (string (builder-add-from-string builder interface))
+      (pathname (builder-add-from-file builder interface)))
+    (when connect-signals
+      (builder-connect-signals builder package)))
+
+
+  (defbinding builder-add-from-file () boolean
+   builder
+   pathname
+   (nil gerror-signal :out))
+
+  (defbinding builder-add-from-string () boolean
+   builder
+   (buffer string)
+   (-1 int) ; TODO: add gsize type
+   (nil gerror-signal :out))
+
+  (defbinding builder-get-object () gobject
+   builder
+   (name string))
+
+  (defbinding builder-get-objects () (gslist gobject)
+   builder)
+
+  (defun intern-with-package-prefix (name default-package)
+    (let ((pos (position #\: name)))
+      (if pos
+         (intern 
+          (string-upcase (subseq name (1+ pos)))
+          (string-upcase (subseq name 0 pos)))
+       (intern (string-upcase name) default-package))))
+
+  (define-callback %builder-connect-function nil
+    (builder (object gobject) (signal-name string) (handler-name string)
+     (connect-object gobject) connect-flags (package user-data-id))
+    (format t "Connect signal ~A for ~A to ~A in default package ~A with flags ~A~%" signal-name object handler-name (find-user-data package) connect-flags)
+    (signal-connect 
+     object signal-name 
+     (intern-with-package-prefix handler-name (find-user-data package))
+     :object (or connect-object object) :after (find :after connect-flags)))
+
+  (defbinding %builder-connect-signals-full (builder package) nil
+    builder    
+    (%builder-connect-function callback)
+    (package user-data-id))
+
+  (defun builder-connect-signals (builder &optional (package *package*))
+    (with-user-data (id package)
+      (%builder-connect-signals-full builder id))))
+