Changeset 15345

Timestamp:

Apr 27, 2012, 2:00:32 PM (13 years ago)

Author:

R. Matthew Emerson

Message:

Introduce new ide-window and ide-view classes and use them for now.
This avoids adding new behavior to the NSWindow class, which
other code typically doesn't expect.

Location:

trunk/source/cocoa-ide

Files:

• cocoa-editor.lisp (modified) (1 diff)
• cocoa-window.lisp (modified) (5 diffs)

trunk/source/cocoa-ide/cocoa-editor.lisp

@@ -2185 +2185 @@
       echo-area)))
                
-(defclass hemlock-frame (ns:ns-window)
+(defclass hemlock-frame (ide-window)
     ((echo-area-view :foreign-type :id)
      (pane :foreign-type :id)

trunk/source/cocoa-ide/cocoa-window.lisp

@@ -346 +346 @@
                         #@"") ))
 
-(defmethod allocate-instance ((class ns:+ns-window)
+(defclass ide-window (ns:ns-window)
+  ()
+  (:metaclass ns:+ns-object))
+
+(defmethod allocate-instance ((class +ide-window)
                               &rest initargs
                               &key
@@ -387 +391 @@
   (apply #'call-next-method class initargs))
 
-(defmethod initialize-instance :after ((w ns:ns-window)
+(defmethod initialize-instance :after ((w ide-window)
                                        &key
                                        (title nil)
@@ -419 +423 @@
     (activate-window w)))
 
-
-(defmethod allocate-instance ((class ns:+ns-view)
+(defclass ide-view (ns:ns-view)
+  ()
+  (:metaclass ns:+ns-object))
+
+(defmethod allocate-instance ((class +ide-view)
                               &rest initargs
                               &key
@@ -436 +443 @@
 
 
-(defmethod initialize-instance :after ((view ns:ns-view)
+(defmethod initialize-instance :after ((view ide-view)
                                        &key
                                        (horizontally-resizable nil hrp)
@@ -482 +489 @@
 
 (defun new-cocoa-window (&key
-                         (class (find-class 'ns:ns-window))
+                         (class (find-class 'ide-window))
                          (title nil)
                          (x 200.0)