Remove calls to release and using for GBoxed structures
authorDmitry Kalyanov <Kalyanov.Dmitry@gmail.com>
Thu, 6 Aug 2009 21:38:21 +0000 (01:38 +0400)
committerDmitry Kalyanov <Kalyanov.Dmitry@gmail.com>
Thu, 6 Aug 2009 21:38:21 +0000 (01:38 +0400)
gtk/gtk.combo-box.lisp
gtk/gtk.demo.lisp
gtk/gtk.text.lisp
gtk/gtk.tree-selection.lisp

index 528958a..5e58ee5 100644 (file)
@@ -6,9 +6,8 @@
 
 (defun combo-box-get-active-iter (combo-box)
   (let ((i (make-instance 'tree-iter)))
-    (if (gtk-combo-box-get-active-iter combo-box i)
-        i
-        (release i))))
+    (when (gtk-combo-box-get-active-iter combo-box i)
+      i)))
 
 (defcfun (combo-box-active-text "gtk_combo_box_get_active_text") (:string :free-from-foreign t)
   (combo-box g-object))
index 435e97a..db816ab 100644 (file)
     (let ((window (make-instance 'gtk-window :type :toplevel :app-paintable t))
           x y)
       (g-signal-connect window "destroy" (lambda (widget)
-                                           (release widget)
                                            (leave-gtk-main)))
       (g-signal-connect window "motion-notify-event" (lambda (widget event)
-                                                       (release widget)
                                                        (setf x (event-motion-x event)
                                                              y (event-motion-y event))
                                                        (widget-queue-draw window)))
       (g-signal-connect window "expose-event"
                         (lambda (widget event)
                           (declare (ignore event))
-                          (release widget)
                                         ;(print event)
-                          (using* ((gdk-window (widget-window window))
-                                   (gc (gdk-gc-new gdk-window))
-                                   (layout (widget-create-pango-layout window (format nil "X: ~F~%Y: ~F" x y))))
+                          (let* ((gdk-window (widget-window window))
+                                 (gc (gdk-gc-new gdk-window))
+                                 (layout (widget-create-pango-layout window (format nil "X: ~F~%Y: ~F" x y))))
                             (gdk-draw-layout gdk-window gc 0 0 layout)
                             (gdk-gc-set-rgb-fg-color gc (make-color :red 65535 :green 0 :blue 0))
                             (multiple-value-bind (x y) (drawable-get-size gdk-window)
@@ -56,7 +53,6 @@
       (g-signal-connect window "configure-event"
                         (lambda (widget event)
                           (declare (ignore event))
-                          (release widget)
                           (widget-queue-draw window)))
       (widget-show window)
       (push :pointer-motion-mask (gdk-window-events (widget-window window))))))
         (box-pack-start box w)
         (container-add w text-view))
       (container-add window box)
-      (g-signal-connect window "destroy" (lambda (widget) (release widget) (leave-gtk-main)))
+      (g-signal-connect window "destroy" (lambda (widget) (leave-gtk-main)))
       (g-signal-connect window "delete-event" (lambda (widget event)
                                                 (declare (ignore event))
-                                                (release widget)
-                                                (using (dlg (make-instance 'message-dialog :text "Are you sure?" :buttons :yes-no))
+                                                (let ((dlg (make-instance 'message-dialog
+                                                                          :text "Are you sure?"
+                                                                          :buttons :yes-no)))
                                                   (let ((response (dialog-run dlg)))
                                                     (object-destroy dlg)
                                                     (not (eq :yes response))))))
-      (g-signal-connect button "clicked" (lambda (button) (release button)
+      (g-signal-connect button "clicked" (lambda (button)
                                                  (setf (text-buffer-text text-buffer)
                                                        (format nil "~A~%~A" (text-buffer-text text-buffer) (entry-text entry))
                                                        (entry-text entry) "")))
-      (g-signal-connect button-select "clicked" (lambda (button) (release button)
+      (g-signal-connect button-select "clicked" (lambda (button)
                                                         (editable-select-region entry 5 10)))
-      (g-signal-connect button-insert "clicked" (lambda (button) (release button)
+      (g-signal-connect button-insert "clicked" (lambda (button)
                                                         (editable-insert-text entry "hello" 2)))
       (widget-show window))))
 
       (table-attach table button-1 0 1 0 1)
       (table-attach table button-2 1 2 0 1)
       (table-attach table button-q 0 2 1 2)
-      (g-signal-connect window "destroy" (lambda (w) (release w) (leave-gtk-main)))
-      (g-signal-connect button-q "clicked" (lambda (b) (release b) (object-destroy window)))
+      (g-signal-connect window "destroy" (lambda (w) (leave-gtk-main)))
+      (g-signal-connect button-q "clicked" (lambda (b) (object-destroy window)))
       (widget-show window))))
 
 (defun test-pixbuf ()
           (vbox-1 (make-instance 'v-box)))
      (container-add window vbox)
      (box-pack-start vbox (make-instance 'label :text "Placing bg image" :font "Times New Roman Italic 10" :color "#00f" :request-height 40))
-     (g-signal-connect window "destroy" (lambda (w) (release w) (leave-gtk-main)))
+     (g-signal-connect window "destroy" (lambda (w) (leave-gtk-main)))
      (box-pack-start vbox eventbox)
      (container-add eventbox vbox-1)
      (box-pack-start vbox-1 (make-instance 'label :text "This is the eventbox"))
     (let* ((window (make-instance 'gtk-window :title "Test images"))
            (image (make-instance 'image :icon-name "applications-development" :icon-size 6)))
       (container-add window image)
-      (g-signal-connect window "destroy" (lambda (w) (release w) (leave-gtk-main)))
+      (g-signal-connect window "destroy" (lambda (w) (leave-gtk-main)))
       (widget-show window))))
 
 (defun test-progress-bar ()
            (button-pulse (make-instance 'button :label "Pulse"))
            (button-set (make-instance 'button :label "Set"))
            (entry (make-instance 'entry)))
-      (g-signal-connect window "destroy" (lambda (w) (release w) (leave-gtk-main)))
+      (g-signal-connect window "destroy" (lambda (w) (leave-gtk-main)))
       (container-add window v-box)
       (box-pack-start v-box p-bar)
       (box-pack-start v-box button-pulse)
       (box-pack-start v-box button-set)
       (box-pack-start v-box entry)
-      (g-signal-connect button-pulse "clicked" (lambda (w) (release w) (progress-bar-pulse p-bar)))
-      (g-signal-connect button-set "clicked" (lambda (w) (release w)
+      (g-signal-connect button-pulse "clicked" (lambda (w) (progress-bar-pulse p-bar)))
+      (g-signal-connect button-set "clicked" (lambda (w)
                                                      (setf (progress-bar-fraction p-bar)
                                                            (coerce (read-from-string (entry-text entry)) 'real))))
       (widget-show window))))
            (entry (make-instance 'entry))
            (icon (make-instance 'status-icon :icon-name "applications-development")))
       (set-status-icon-tooltip icon "An icon from lisp program")
-      (g-signal-connect window "destroy" (lambda (w) (release w)
+      (g-signal-connect window "destroy" (lambda (w)
                                                  #+ (or) (setf (status-icon-visible icon) nil)
                                                  (leave-gtk-main)))
-      (g-signal-connect button-push "clicked" (lambda (b) (release b) (status-bar-push status-bar "lisp-prog" (entry-text entry))))
-      (g-signal-connect button-pop "clicked" (lambda (b) (release b) (status-bar-pop status-bar "lisp-prog")))
-      (g-signal-connect icon "activate" (lambda (i) (release i)
-                                                (using (message-dialog (make-instance 'message-dialog :buttons :ok :text "You clicked on icon!"))
+      (g-signal-connect button-push "clicked" (lambda (b) (status-bar-push status-bar "lisp-prog" (entry-text entry))))
+      (g-signal-connect button-pop "clicked" (lambda (b) (status-bar-pop status-bar "lisp-prog")))
+      (g-signal-connect icon "activate" (lambda (i)
+                                                (let ((message-dialog (make-instance 'message-dialog
+                                                                                     :buttons :ok
+                                                                                     :text "You clicked on icon!")))
                                                   (dialog-run message-dialog)
                                                   (object-destroy message-dialog))))
       (container-add window v-box)
   (within-main-loop
     (let* ((window (make-instance 'gtk-window :type :toplevel :title "Testing scale button"))
            (button (make-instance 'scale-button :icons (list "media-seek-backward" "media-seek-forward" "media-playback-stop" "media-playback-start") :adjustment (make-instance 'adjustment :lower -40 :upper 50 :value 20))))
-      (g-signal-connect window "destroy" (lambda (w) (release w) (leave-gtk-main)))
+      (g-signal-connect window "destroy" (lambda (w) (leave-gtk-main)))
       (container-add window button)
       (widget-show window))))
 
            (v (make-instance 'text-view :buffer buffer :wrap-mode :word))
            (box (make-instance 'v-box))
            (scrolled (make-instance 'scrolled-window :hscrollbar-policy :automatic :vscrollbar-policy :automatic)))
-      (g-signal-connect window "destroy" (lambda (w) (release w) (leave-gtk-main)))
+      (g-signal-connect window "destroy" (lambda (w) (leave-gtk-main)))
       (g-signal-connect button "clicked" (lambda (b)
-                                           (release b)
-                                           (using* ((i1 (make-instance 'text-iter))
-                                                    (i2 (make-instance 'text-iter)))
+                                           (let* ((i1 (make-instance 'text-iter))
+                                                  (i2 (make-instance 'text-iter)))
                                              (multiple-value-bind (i1 i2) (text-buffer-get-selection-bounds buffer)
                                                (when (and i1 i2)
-                                                 (using* ((i1 i1) (i2 i2)
-                                                          (dialog (make-instance 'message-dialog :buttons :ok)))
-                                                   (setf (message-dialog-text dialog) (format nil "selection: from (~A,~A) to (~A,~A)"
-                                                                                              (text-iter-line i1) (text-iter-line-offset i1)
-                                                                                              (text-iter-line i2) (text-iter-line-offset i2)))
+                                                 (let* ((i1 i1) (i2 i2)
+                                                        (dialog (make-instance 'message-dialog :buttons :ok)))
+                                                   (setf (message-dialog-text dialog)
+                                                         (format nil "selection: from (~A,~A) to (~A,~A)"
+                                                                 (text-iter-line i1) (text-iter-line-offset i1)
+                                                                 (text-iter-line i2) (text-iter-line-offset i2)))
                                                    (dialog-run dialog)
                                                    (object-destroy dialog)))))))
       (g-signal-connect bold-btn "clicked" (Lambda (b)
-                                             (release b)
                                              (multiple-value-bind (start end) (text-buffer-get-selection-bounds buffer)
                                                (when (and start end)
-                                                 (using* ((start start) (end end) (tag (text-tag-table-lookup (text-buffer-tag-table buffer) "bold")))
+                                                 (let* ((start start)
+                                                        (end end)
+                                                        (tag (text-tag-table-lookup (text-buffer-tag-table buffer) "bold")))
                                                    (if (text-iter-has-tag start tag)
                                                        (text-buffer-remove-tag buffer tag start end)
                                                        (text-buffer-apply-tag buffer tag start end)))))))
                           (lambda (tag object event iter)
                             (declare (ignore tag object iter))
                             (when (eq (event-type event) :button-release)
-                              (using (dlg (make-instance 'message-dialog :text "You clicked on bold text." :buttons :ok))
+                              (let ((dlg (make-instance 'message-dialog :text "You clicked on bold text." :buttons :ok)))
                                 (dialog-run dlg)
                                 (object-destroy dlg))))))
       (container-add window box)
            (scrolled (make-instance 'scrolled-window :hscrollbar-policy :automatic :vscrollbar-policy :automatic))
            (buffer (make-instance 'text-buffer))
            (view (make-instance 'text-view :buffer buffer)))
-      (g-signal-connect window "destroy" (lambda (w) (release w) (leave-gtk-main)))
+      (g-signal-connect window "destroy" (lambda (w) (leave-gtk-main)))
       (container-add window scrolled)
       (container-add scrolled view)
       (widget-show window)
       (g-signal-connect buffer "insert-text" (lambda (buffer location text len)
-                                               (using* ((buffer buffer) (location location))
+                                               (let* ((buffer buffer)
+                                                      (location location))
                                                  (format t "~A~%" (list buffer location text len))))))))
 
 (defstruct tvi title value)
       (store-add-item model (make-tvi :title "Saturday" :value 6))
       (store-add-item model (make-tvi :title "Sunday" :value 7))
       (setf (tree-view-model tv) model (tree-view-tooltip-column tv) 0)
-      (gobject:g-signal-connect window "destroy" (lambda (w) (gobject:release w) (leave-gtk-main)))
-      (gobject:g-signal-connect button "clicked" (lambda (b) (gobject:release b) 
+      (gobject:g-signal-connect window "destroy" (lambda (w) (leave-gtk-main)))
+      (gobject:g-signal-connect button "clicked" (lambda (b) 
                                                          (store-add-item model (make-tvi :title (entry-text title-entry)
                                                                                          :value (or (parse-integer (entry-text value-entry) 
                                                                                                                    :junk-allowed t)
                                                                                                     0)))))
       (g-signal-connect tv "row-activated" (lambda (tv path column)
-                                             (release* tv path column)
                                              (format t "You clicked on row ~A~%" (tree-path-indices path))))
       (container-add window v-box)
       (box-pack-start v-box h-box :expand nil)
       (store-add-item model (make-tvi :title "Friday" :value 5))
       (store-add-item model (make-tvi :title "Saturday" :value 6))
       (store-add-item model (make-tvi :title "Sunday" :value 7))
-      (gobject:g-signal-connect window "destroy" (lambda (w) (gobject:release w) (leave-gtk-main)))
-      (gobject:g-signal-connect button "clicked" (lambda (b) (gobject:release b) 
+      (gobject:g-signal-connect window "destroy" (lambda (w) (leave-gtk-main)))
+      (gobject:g-signal-connect button "clicked" (lambda (b)
                                                          (store-add-item model (make-tvi :title (entry-text title-entry)
                                                                                          :value (or (parse-integer (entry-text value-entry) 
                                                                                                                    :junk-allowed t)
       <separator/>
   </toolbar>
 </ui>")
-      (gobject:g-signal-connect window "destroy" (lambda (w) (gobject:release w) (leave-gtk-main)))
+      (gobject:g-signal-connect window "destroy" (lambda (w) (leave-gtk-main)))
       (iter (with fn = (lambda (action) (when print-confirmation (format t "Action ~A with name ~A activated~%" action (action-name action)))))
             (with action-group = (make-instance 'action-group :name "Actions"))
             (finally (let ((a (make-instance 'toggle-action :name "print-confirm" :label "Print" :stock-id "gtk-print-report" :active t)))
   (within-main-loop
     (let ((window (make-instance 'gtk-window :title "Color button" :type :toplevel :window-position :center :width-request 100 :height-request 100))
           (button (make-instance 'color-button :title "Color button")))
-      (g-signal-connect window "destroy" (lambda (w) (release w) (leave-gtk-main)))
-      (g-signal-connect button "color-set" (lambda (b) (release b) (format t "Chose color ~A~%" (color-button-color button))))
+      (g-signal-connect window "destroy" (lambda (w) (leave-gtk-main)))
+      (g-signal-connect button "color-set" (lambda (b) (format t "Chose color ~A~%" (color-button-color button))))
       (container-add window button)
       (widget-show window))))
 
       (setf (tree-view-model tree-view) model
             (tree-view-tooltip-column tree-view) 0)
       (connect-signal tree-view "row-activated" (lambda (tv path column)
-                                                  (release* tv path column)
                                                   (format t "You clicked on row ~A~%" (tree-path-indices path))))
       (connect-signal button "clicked" (lambda (b)
                                          (declare (ignore b))
index 9526d23..85d611d 100644 (file)
             (gtk-text-iter-forward-search start-position string flags i1 i2 limit)
             (gtk-text-iter-backward-search start-position string flags i1 i2 limit))
         (values t i1 i2)
-        (progn (release i1)
-               (release i2)
-               (values nil nil nil)))))
+        (values nil nil nil))))
 
 (export 'text-iter-search)
 
         (i2 (make-instance 'text-iter)))
     (if (gtk-text-buffer-get-selection-bounds buffer i1 i2)
         (values i1 i2)
-        (progn (release i1)
-               (release i2)
-               (values nil nil)))))
+        (values nil nil))))
 
 (export 'text-buffer-get-selection-bounds)
 
index 79d1095..74e4e1b 100644 (file)
@@ -34,9 +34,8 @@
 
 (defun tree-selection-selected (tree-selection)
   (let ((iter (make-instance 'tree-iter)))
-    (if (gtk-tree-selection-get-selected tree-selection (null-pointer) iter)
-        iter
-        (release iter))))
+    (when (gtk-tree-selection-get-selected tree-selection (null-pointer) iter)
+      iter)))
 
 (export 'tree-selection-selected)