Changeset 15284 for release/1.8


Ignore:
Timestamp:
Mar 28, 2012, 9:21:34 PM (7 years ago)
Author:
rme
Message:

Restarts window fix from trunk.

Location:
release/1.8/source
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • release/1.8/source

  • release/1.8/source/cocoa-ide/cocoa-listener.lisp

    r15263 r15284  
    603603    (make-instance 'sequence-window-controller
    604604      :sequence (cdr (ccl::bt.restarts context))
     605      :before-close-function #'(lambda (wc)
     606                                 (declare (ignore wc))
     607                                 (setf (car (ccl::bt.restarts context)) nil))
    605608      :result-callback #'(lambda (r)
     609                           (execute-in-gui #'(lambda ()
     610                                               (#/close (car (ccl::bt.restarts context)))))
    606611                           (process-interrupt
    607612                            process
  • release/1.8/source/cocoa-ide/cocoa-utils.lisp

    r15201 r15284  
    2626     (result-callback :initarg :result-callback)
    2727     (display :initform #'(lambda (item stream) (prin1 item stream)) :initarg :display)
    28      (title :initform "Sequence dialog" :initarg :title))
     28     (title :initform "Sequence dialog" :initarg :title)
     29     (before-close-function :initarg :before-close-function :initform nil))
    2930  (:metaclass ns:+ns-object))
    3031
     
    3738         (scrollview (make-instance 'ns:ns-scroll-view :with-frame contentframe)))
    3839    (#/setWindow: self w)
     40    (#/release w)
    3941    (#/setDelegate: w self)
    4042    (#/setWindowController: w self)
     
    7375
    7476(objc:defmethod (#/dealloc :void) ((self sequence-window-controller))
     77  (objc:remove-lisp-slots self)
    7578  (call-next-method))
    7679
     
    7982  (declare (ignore notification))
    8083  (#/setDataSource: (slot-value self 'table-view) +null-ptr+)
     84  (with-slots (before-close-function) self
     85    (when (functionp before-close-function)
     86      (funcall before-close-function self)))
    8187  (#/autorelease self))
    8288
Note: See TracChangeset for help on using the changeset viewer.