diff --git a/clim/ptypes1.lisp b/clim/ptypes1.lisp index 725b0446e542a741fee7d62b4d8960ae44e76b1e..a3189f2ef1b0269cd95e22e1ec0974bb8efc68ce 100644 --- a/clim/ptypes1.lisp +++ b/clim/ptypes1.lisp @@ -1,6 +1,6 @@ ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CLIM-INTERNALS; Base: 10; Lowercase: Yes -*- -;; $fiHeader: ptypes1.lisp,v 1.20 92/11/13 14:45:59 cer Exp $ +;; $fiHeader: ptypes1.lisp,v 1.21 92/12/03 10:27:39 cer Exp $ (in-package :clim-internals) @@ -422,6 +422,9 @@ (defmethod acceptable-presentation-type-class ((class (eql (find-class 't)))) t) (defmethod acceptable-presentation-type-class ((class t)) nil) +#+Allegro +(defmethod acceptable-presentation-type-class ((class (eql (find-class 'common-lisp:structure-object)))) t) + ;;; Abstract flavors aren't accepted since CLASS-PROTOTYPE signals an error #+Genera (defmethod acceptable-presentation-type-class ((class clos-internals::flavor-class)) @@ -529,7 +532,7 @@ (warn "It is not valid to define a presentation type abbreviation with~@ the same name as a CLOS class."))) ;; Generate the expander function and pass it to load-presentation-type-abbreviation - `(progn + `(define-group ,name define-presentation-type-abbreviation (eval-when (compile) #+(or Genera Cloe-Runtime Minima CCL-2) (setf (compile-time-property ',name 'presentation-type-abbreviation) diff --git a/clim/surround-output.lisp b/clim/surround-output.lisp index 4dca4f5e41ab3d176f6aea464559dd31e7b2c49b..2051e4f91f428e6563eb87f1e680f9e2cc30ad87 100644 --- a/clim/surround-output.lisp +++ b/clim/surround-output.lisp @@ -1,6 +1,6 @@ ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CLIM-INTERNALS; Base: 10; Lowercase: Yes -*- -;; $fiHeader: surround-output.lisp,v 1.7 92/10/02 15:20:03 cer Exp $ +;; $fiHeader: surround-output.lisp,v 1.8 92/11/19 14:18:29 cer Exp $ (in-package :clim-internals) @@ -23,7 +23,7 @@ (multiple-value-bind (doc declarations body) (extract-declarations body) (declare (ignore doc)) - `(progn + `(define-group ,name define-border-type (defun ,name ,arglist ,@(and ignores `((declare (ignore ,@ignores)))) ,@declarations @@ -46,7 +46,7 @@ (define-border-type :rectangle (stream left top right bottom - &rest drawing-options &key (filled nil) &allow-other-keys) + &rest drawing-options &key (filled nil) &allow-other-keys) (declare (dynamic-extent drawing-options)) (let ((offset 2)) (apply #'draw-rectangle* stream diff --git a/misc/make-stub-file b/misc/make-stub-file index 12d5d535611547815077a5b502d8515a8f975b1e..48ddf2a53d9c7e3ee28387789ae023abb83c3f49 100755 --- a/misc/make-stub-file +++ b/misc/make-stub-file @@ -1,12 +1,12 @@ #! /bin/sh -# $fiHeader$ +# $fiHeader: make-stub-file,v 1.2 92/03/24 19:46:40 cer Exp $ header=$1 shift; echo $header echo "{" for file in $*; do - cat $file | sed -e 's/$/();/' -e 's/_//' + cat $file | sed -e 's/$/();/' done echo "}" diff --git a/misc/make-stub-file1 b/misc/make-stub-file1 new file mode 100755 index 0000000000000000000000000000000000000000..4370d873b0e7e644c28a8aef8ad2a9966d63dc1b --- /dev/null +++ b/misc/make-stub-file1 @@ -0,0 +1,20 @@ +#! /bin/sh +# $fiHeader: make-stub-file,v 1.2 92/03/24 19:46:40 cer Exp $ + +header=$1 +shift; +echo $header +echo "{ int i;" + +for file in $*; do + cat $file | sed -e 's/^/extern int /' -e 's/$/;/' +done + +for file in $*; do + cat $file | sed -e 's/^/i = /' -e 's/$/;/' +done + +echo "}" + + + diff --git a/tk/ol-classes.lisp b/tk/ol-classes.lisp index 06163a398b3a520fe55a3a488d1aea3f86b89fe0..d189eecb0a27f1e6a7c34855f628a4db62b26dd6 100644 --- a/tk/ol-classes.lisp +++ b/tk/ol-classes.lisp @@ -20,89 +20,89 @@ ;; 52.227-19 or DOD FAR Supplement 252.227-7013 (c) (1) (ii), as ;; applicable. ;; -;; $fiHeader: ol-classes.lisp,v 1.7 92/08/18 17:53:40 cer Exp $ +;; $fiHeader: ol-classes.lisp,v 1.8 92/11/13 14:46:58 cer Exp $ (in-package :tk) (defparameter *openlook-classes* '( ;; Base classes - "_applicationShellWidgetClass" - "_compositeWidgetClass" - "_constraintWidgetClass" - "_coreWidgetClass" - "_objectClass" - "_overrideShellWidgetClass" - "_shellWidgetClass" - "_topLevelShellWidgetClass" - "_transientShellWidgetClass" - "_vendorShellWidgetClass" - "_wmShellWidgetClass" + "applicationShellWidgetClass" + "compositeWidgetClass" + "constraintWidgetClass" + "coreWidgetClass" + "objectClass" + "overrideShellWidgetClass" + "shellWidgetClass" + "topLevelShellWidgetClass" + "transientShellWidgetClass" + "vendorShellWidgetClass" + "wmShellWidgetClass" ;; OpenLook specific classes ;; Some of these are both gadgets ;; and widget and I think the ;; names are the same! - "_abbrevMenuButtonWidgetClass" - "_abbrevStackWidgetClass" - "_arrowWidgetClass" - "_baseWindowShellWidgetClass" - "_bulletinBoardWidgetClass" - "_buttonWidgetClass" - "_buttonGadgetClass" - "_buttonStackWidgetClass" + "abbrevMenuButtonWidgetClass" + "abbrevStackWidgetClass" + "arrowWidgetClass" + "baseWindowShellWidgetClass" + "bulletinBoardWidgetClass" + "buttonWidgetClass" + "buttonGadgetClass" + "buttonStackWidgetClass" - ;;"_buttonStackGadgetClass" + ;;"buttonStackGadgetClass" - "_captionWidgetClass" - "_checkBoxWidgetClass" - "_controlAreaWidgetClass" - "_eventObjClass" - "_exclusivesWidgetClass" - "_flatCheckBoxWidgetClass" - "_flatExclusivesWidgetClass" - "_flatNonexclusivesWidgetClass" - "_flatWidgetClass" - "_footerPanelWidgetClass" - "_formWidgetClass" - "_gaugeWidgetClass" - "_helpWidgetClass" - "_listPaneWidgetClass" - "_magWidgetClass" - "_managerWidgetClass" - "_menuShellWidgetClass" - "_menuButtonWidgetClass" + "captionWidgetClass" + "checkBoxWidgetClass" + "controlAreaWidgetClass" + "eventObjClass" + "exclusivesWidgetClass" + "flatCheckBoxWidgetClass" + "flatExclusivesWidgetClass" + "flatNonexclusivesWidgetClass" + "flatWidgetClass" + "footerPanelWidgetClass" + "formWidgetClass" + "gaugeWidgetClass" + "helpWidgetClass" + "listPaneWidgetClass" + "magWidgetClass" + "managerWidgetClass" + "menuShellWidgetClass" + "menuButtonWidgetClass" - ;;"_menuButtonGadgetClass" + ;;"menuButtonGadgetClass" - "_nonexclusivesWidgetClass" - "_noticeShellWidgetClass" - "_oblongButtonWidgetClass" - ;; "_oblongButtonGadgetClass" - "_popupWindowShellWidgetClass" - "_primitiveWidgetClass" - "_pushpinWidgetClass" - "_rectButtonWidgetClass" - "_scrollbarWidgetClass" - "_scrolledWindowWidgetClass" - "_scrollingListWidgetClass" - "_sliderWidgetClass" - "_staticTextWidgetClass" - "_stubWidgetClass" + "nonexclusivesWidgetClass" + "noticeShellWidgetClass" + "oblongButtonWidgetClass" + ;; "oblongButtonGadgetClass" + "popupWindowShellWidgetClass" + "primitiveWidgetClass" + "pushpinWidgetClass" + "rectButtonWidgetClass" + "scrollbarWidgetClass" + "scrolledWindowWidgetClass" + "scrollingListWidgetClass" + "sliderWidgetClass" + "staticTextWidgetClass" + "stubWidgetClass" - ;;"_textWidgetClass" + ;;"textWidgetClass" ;;; This two seem to be broken! - ;;"_textPaneWidgetClass" + ;;"textPaneWidgetClass" ;; Try this again - "_textEditWidgetClass" - "_textFieldWidgetClass" + "textEditWidgetClass" + "textFieldWidgetClass" - "_compositeWidgetClass" - "_overrideShellWidgetClass" - "_shellWidgetClass" - "_topLevelShellWidgetClass" - "_widgetClass" - "_widgetClassRec" - "_drawAreaWidgetClass" + "compositeWidgetClass" + "overrideShellWidgetClass" + "shellWidgetClass" + "topLevelShellWidgetClass" + "widgetClass" + "widgetClassRec" + "drawAreaWidgetClass" )) diff --git a/tk/xm-classes.lisp b/tk/xm-classes.lisp index 0f6f0b9d044ce223d77d4e0218d065ab3861d207..0f959be95907741620875e2398a99b7bef9f1104 100644 --- a/tk/xm-classes.lisp +++ b/tk/xm-classes.lisp @@ -20,59 +20,59 @@ ;; 52.227-19 or DOD FAR Supplement 252.227-7013 (c) (1) (ii), as ;; applicable. ;; -;; $fiHeader: xm-classes.lisp,v 1.6 92/07/01 15:44:39 cer Exp $ +;; $fiHeader: xm-classes.lisp,v 1.7 92/08/18 17:53:49 cer Exp $ (in-package :tk) ;;; This has to kept consistent with the Makefile -(defparameter *motif-classes* '("_applicationShellWidgetClass" - "_compositeWidgetClass" - "_constraintWidgetClass" - "_coreWidgetClass" - "_objectClass" - "_overrideShellWidgetClass" - "_shellWidgetClass" - "_topLevelShellWidgetClass" - "_transientShellWidgetClass" - "_vendorShellWidgetClass" - "_wmShellWidgetClass" +(defparameter *motif-classes* '("applicationShellWidgetClass" + "compositeWidgetClass" + "constraintWidgetClass" + "coreWidgetClass" + "objectClass" + "overrideShellWidgetClass" + "shellWidgetClass" + "topLevelShellWidgetClass" + "transientShellWidgetClass" + "vendorShellWidgetClass" + "wmShellWidgetClass" - "_xmArrowButtonGadgetClass" - "_xmArrowButtonWidgetClass" - "_xmBulletinBoardWidgetClass" - "_xmCascadeButtonGadgetClass" - "_xmCascadeButtonWidgetClass" - "_xmCommandWidgetClass" - "_xmDialogShellWidgetClass" - "_xmDrawingAreaWidgetClass" - "_xmDrawnButtonWidgetClass" - "_xmFileSelectionBoxWidgetClass" - "_xmFormWidgetClass" - "_xmFrameWidgetClass" - "_xmGadgetClass" - "_xmLabelGadgetClass" - "_xmLabelWidgetClass" - "_xmListWidgetClass" - "_xmMainWindowWidgetClass" - "_xmManagerWidgetClass" - "_xmMenuShellWidgetClass" - "_xmMessageBoxWidgetClass" - "_xmPanedWindowWidgetClass" - "_xmPrimitiveWidgetClass" - "_xmPushButtonGadgetClass" - "_xmPushButtonWidgetClass" - "_xmRowColumnWidgetClass" - "_xmScaleWidgetClass" - "_xmScrollBarWidgetClass" - "_xmScrolledWindowWidgetClass" - "_xmSelectionBoxWidgetClass" - "_xmSeparatorGadgetClass" - "_xmSeparatorWidgetClass" - "_xmTextFieldWidgetClass" - "_xmTextWidgetClass" - "_xmToggleButtonGadgetClass" - "_xmToggleButtonWidgetClass" - "_xmMyDrawingAreaWidgetClass" + "xmArrowButtonGadgetClass" + "xmArrowButtonWidgetClass" + "xmBulletinBoardWidgetClass" + "xmCascadeButtonGadgetClass" + "xmCascadeButtonWidgetClass" + "xmCommandWidgetClass" + "xmDialogShellWidgetClass" + "xmDrawingAreaWidgetClass" + "xmDrawnButtonWidgetClass" + "xmFileSelectionBoxWidgetClass" + "xmFormWidgetClass" + "xmFrameWidgetClass" + "xmGadgetClass" + "xmLabelGadgetClass" + "xmLabelWidgetClass" + "xmListWidgetClass" + "xmMainWindowWidgetClass" + "xmManagerWidgetClass" + "xmMenuShellWidgetClass" + "xmMessageBoxWidgetClass" + "xmPanedWindowWidgetClass" + "xmPrimitiveWidgetClass" + "xmPushButtonGadgetClass" + "xmPushButtonWidgetClass" + "xmRowColumnWidgetClass" + "xmScaleWidgetClass" + "xmScrollBarWidgetClass" + "xmScrolledWindowWidgetClass" + "xmSelectionBoxWidgetClass" + "xmSeparatorGadgetClass" + "xmSeparatorWidgetClass" + "xmTextFieldWidgetClass" + "xmTextWidgetClass" + "xmToggleButtonGadgetClass" + "xmToggleButtonWidgetClass" + "xmMyDrawingAreaWidgetClass" )) diff --git a/tk/xt-classes.lisp b/tk/xt-classes.lisp index 5677096f0b646535e67a7cac9370281b04b1bb5b..374db7bb3876f7259ea2314193a9b705e72790ac 100644 --- a/tk/xt-classes.lisp +++ b/tk/xt-classes.lisp @@ -20,21 +20,21 @@ ;; 52.227-19 or DOD FAR Supplement 252.227-7013 (c) (1) (ii), as ;; applicable. ;; -;; $fiHeader: xt-classes.lisp,v 1.1 92/02/16 20:30:59 cer Exp $ +;; $fiHeader: xt-classes.lisp,v 1.2 92/02/24 13:04:13 cer Exp $ (in-package :tk) ;;; This has to kept consistent with the Makefile (defparameter *intrinsic-classes* '( - "_constraintWidgetClass" - "_objectClass" - "_wmShellWidgetClass" - "_vendorShellWidgetClass" - "_coreWidgetClass" - "_shellWidgetClass" - "_compositeWidgetClass" - "_applicationShellWidgetClass" - "_overrideShellWidgetClass" - "_topLevelShellWidgetClass" - "_transientShellWidgetClass")) + "constraintWidgetClass" + "objectClass" + "wmShellWidgetClass" + "vendorShellWidgetClass" + "coreWidgetClass" + "shellWidgetClass" + "compositeWidgetClass" + "applicationShellWidgetClass" + "overrideShellWidgetClass" + "topLevelShellWidgetClass" + "transientShellWidgetClass")) diff --git a/utils/processes.lisp b/utils/processes.lisp index ca8d89740428cc52f931642b987fb655c7b695df..81f791e880ce6cb16e2ca4155da64251161859f3 100644 --- a/utils/processes.lisp +++ b/utils/processes.lisp @@ -1,6 +1,6 @@ ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CLIM-UTILS; Base: 10; Lowercase: Yes -*- -;; $fiHeader: processes.lisp,v 1.12 92/10/28 11:31:11 cer Exp $ +;; $fiHeader: processes.lisp,v 1.13 92/11/20 08:47:17 cer Exp $ (in-package :clim-utils) @@ -16,10 +16,11 @@ otherwise nil } ) - -#+Allegro -(unless (excl::scheduler-running-p) - (mp:start-scheduler)) + +;;-- I dont think we need this +;#+Allegro +;(unless (excl::scheduler-running-p) +; (mp:start-scheduler)) (defmacro with-lock-held ((place &optional state) &body forms) #+(or Allegro Xerox Genera ccl Minima) diff --git a/xlib/ffi.lisp b/xlib/ffi.lisp index 7f14c8e69b2cf2316b5e4f4e728ec97da59553b5..9b428a6f5a9532dcfec1626004623023ee9cd5f9 100644 --- a/xlib/ffi.lisp +++ b/xlib/ffi.lisp @@ -18,7 +18,7 @@ ;; 52.227-19 or DOD FAR Suppplement 252.227-7013 (c) (1) (ii), as ;; applicable. ;; -;; $fiHeader: ffi.lisp,v 1.12 92/05/22 19:27:22 cer Exp $ +;; $fiHeader: ffi.lisp,v 1.13 92/09/30 18:03:27 cer Exp $ (in-package :x11) @@ -112,7 +112,7 @@ :callback nil :arg-checking nil :return-type 'integer - :entry-point ,(second (assoc :name options)))) + :entry-point ,(ff:convert-to-lang (second (assoc :name options))))) ;;; Delay version @@ -151,7 +151,7 @@ (eval-when (eval load compile) (export ',name)) (eval-when (compile eval load) - ,(let ((c-name (second (assoc :name options))) + ,(let ((c-name (ff:convert-to-lang (second (assoc :name options)))) (return-type (or (second (assoc :return-type options)) 'integer))) `(delayed-defforeign