[Openmcl-cvs-notifications] r12695 - /trunk/source/cocoa-ide/cocoa-editor.lisp

[palter at clozure.com]

Author: palter
Date: Wed Aug 26 16:10:11 2009
New Revision: 12695

Log:
Don't try to do things on Cocotron that aren't implemented.
Allows the open panel (C-x C-f) to work.  Save panel still has problems.

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

Modified: trunk/source/cocoa-ide/cocoa-editor.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/cocoa-ide/cocoa-editor.lisp (original)
+++ trunk/source/cocoa-ide/cocoa-editor.lisp Wed Aug 26 16:10:11 2009
@@ -2705,6 +2705,7 @@
     (setq encoding (nsinteger-to-nsstring-encoding (#/selectedTag popup)))
     (hi::note-modeline-change (hemlock-buffer self))))
 =

+#-cocotron
 (objc:defmethod (#/prepareSavePanel: :<BOOL>) ((self hemlock-editor-docume=
nt)
                                                panel)
   (with-slots (encoding) self
@@ -3045,12 +3046,14 @@
 =

 (objc:defmethod (#/runModalOpenPanel:forTypes: :<NSI>nteger)
     ((self hemlock-document-controller) panel types)
-  (let* ((popup (build-encodings-popup self #|preferred|#)))
-    (#/setAccessoryView: panel popup)
+  (let* (#-cocotron (popup (build-encodings-popup self #|preferred|#)))
+    #-cocotron (#/setAccessoryView: panel popup)
     (let* ((result (call-next-method panel types)))
       (when (=3D result #$NSOKButton)
+        #-cocotron
         (with-slots (last-encoding) self
-          (setq last-encoding (nsinteger-to-nsstring-encoding (#/tag (#/se=
lectedItem popup))))))
+          (setq last-encoding
+                (nsinteger-to-nsstring-encoding (#/tag (#/selectedItem pop=
up))))))
       result)))
   =

 (defun hi::open-document ()