Skip to content
Snippets Groups Projects
Commit 4cd1ee82 authored by cer's avatar cer
Browse files

clim/command.lisp Only inherit keystroke menu items that actually have a keystroke

demo/graphics-editor.lisp	Put in min-width/min-height in graphics-editor
parent 0038dbe7
No related branches found
No related tags found
No related merge requests found
s;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CLIM-INTERNALS; Base: 10; Lowercase: Yes -*-
;; $fiHeader: command.lisp,v 1.22 93/04/23 09:17:17 cer Exp $
;; $fiHeader: command.lisp,v 1.23 93/04/27 14:35:31 cer Exp $
(in-package :clim-internals)
......@@ -136,13 +136,15 @@ s;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CLIM-INTERNALS; Base: 10
(when menu
(dovector (element menu)
(destructuring-bind (string keystroke (type value &rest options)) element
(case inherit-menu
(:menu (set keystroke nil))
(:keystrokes (setq string nil)))
(apply #'add-menu-item-to-command-table
command-table string type value
:keystroke keystroke :errorp nil
options)))))))
(when (case inherit-menu
(:menu (set keystroke nil)
t)
(:keystrokes (setq string nil)
keystroke))
(apply #'add-menu-item-to-command-table
command-table string type value
:keystroke keystroke :errorp nil
options))))))))
(dolist (item menu)
(let* ((string (pop item))
(type (pop item))
......
;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CLIM-GRAPHICS-EDITOR; Base: 10; Lowercase: Yes -*-
;; $fiHeader: graphics-editor.lisp,v 1.17 93/04/23 09:17:53 cer Exp $
;; $fiHeader: graphics-editor.lisp,v 1.18 93/04/27 14:35:44 cer Exp $
(in-package :clim-graphics-editor)
......@@ -275,7 +275,7 @@
:display-function 'display-objects
:scroll-bars :both)
(horizontal-options :accept-values
:height :compute :max-height :compute
:min-height :compute :height :compute :max-height :compute
:display-function
`(accept-values-pane-displayer
:displayer ,#'(lambda (frame stream)
......@@ -283,7 +283,7 @@
frame stream
:orientation :horizontal))))
(vertical-options :accept-values
:width :compute :max-width :compute
:min-width :compute :width :compute :max-width :compute
:display-function
`(accept-values-pane-displayer
:displayer ,#'(lambda (frame stream)
......@@ -601,7 +601,7 @@
(setq frame (make-application-frame 'graphics-editor
:frame-manager framem
:left 100 :top 100
:width 700 :height 500)))
:width 800 :height 500)))
(if entry
(setf (cdr entry) frame)
(push (cons port frame) *graphics-editors*))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment