Author: junrue Date: Sat Oct 21 12:56:48 2006 New Revision: 374 Modified: trunk/docs/manual/clhs-table.xml trunk/docs/manual/gf-data.xsl trunk/docs/manual/gfs-symbols.xml trunk/docs/manual/gfw-symbols.xml trunk/src/packages.lisp trunk/src/uitoolkit/widgets/file-dialog.lisp trunk/src/uitoolkit/widgets/font-dialog.lisp Log: Modified: trunk/docs/manual/clhs-table.xml ============================================================================== --- trunk/docs/manual/clhs-table.xml (original) +++ trunk/docs/manual/clhs-table.xml Sat Oct 21 12:56:48 2006 @@ -17,5 +17,6 @@ <entry name="namestring" url="http://www.lispworks.com/documentation/HyperSpec/Body/26_glo_n.htm#namestring"/> <entry name="pathname" url="http://www.lispworks.com/documentation/HyperSpec/Body/t_pn.htm"/> <entry name="string" url="http://www.lispworks.com/documentation/HyperSpec/Body/t_string.htm"/> + <entry name="symbol" url="http://www.lispworks.com/documentation/HyperSpec/Body/t_symbol.htm"/> <entry name="warning" url="http://www.lispworks.com/documentation/HyperSpec/Body/e_warnin.htm"/> </clhs-table> Modified: trunk/docs/manual/gf-data.xsl ============================================================================== --- trunk/docs/manual/gf-data.xsl (original) +++ trunk/docs/manual/gf-data.xsl Sat Oct 21 12:56:48 2006 @@ -218,7 +218,10 @@ </xsl:for-each> </xsl:element>) => <xsl:element name="emphasis"> - <xsl:apply-templates select="return"/> + <xsl:for-each select="return/*"> + <xsl:apply-templates select="."/> + <xsl:if test="not(position()=last())">, </xsl:if> + </xsl:for-each> </xsl:element> </xsl:element> Modified: trunk/docs/manual/gfs-symbols.xml ============================================================================== --- trunk/docs/manual/gfs-symbols.xml (original) +++ trunk/docs/manual/gfs-symbols.xml Sat Oct 21 12:56:48 2006 @@ -816,7 +816,7 @@ </argument> </arguments> <return> - foreign pointer + <emphasis>foreign pointer</emphasis> </return> </syntax> <description> Modified: trunk/docs/manual/gfw-symbols.xml ============================================================================== --- trunk/docs/manual/gfw-symbols.xml (original) +++ trunk/docs/manual/gfw-symbols.xml Sat Oct 21 12:56:48 2006 @@ -2036,6 +2036,81 @@ <!-- FUNCTIONS --> + <function name="capture-mouse"> + <syntax> + <arguments> + <argument name="window"> + <description> + The <reftopic>gfw:window</reftopic> in which to capture the mouse. + </description> + </argument> + </arguments> + <return> + <emphasis>undefined</emphasis> + </return> + </syntax> + <description> + Enables <arg0/> to receive mouse input events even when the mouse pointer + is outside its bounds, and at the same time, prevent other windows from + receiving those mouse events. Only one window at a time can capture the + mouse. This function is primarily intended for use with a window in the + foreground; background windows may still capture the mouse, but only mouse + move events will be received and those only when the mouse hotspot is within + the visible portions of such a window. + </description> + <seealso> + <reftopic>gfw:release-mouse</reftopic> + </seealso> + </function> + + <function name="release-mouse"> + <syntax> + <return> + <emphasis>undefined</emphasis> + </return> + </syntax> + <description> + Clears the mouse capture state to restore normal mouse input processing. + </description> + <seealso> + <reftopic>gfw:capture-mouse</reftopic> + </seealso> + </function> + + <function name="layout-attribute"> + <syntax with-setf="t"> + <arguments> + <argument name="layout-manager"> + <description> + The <reftopic>gfw:layout-manager</reftopic> responsible for + positioning <arg1/>'s children. + </description> + </argument> + <argument name="container"> + <description> + A <reftopic>gfw:window</reftopic> or other type containing + children. + </description> + </argument> + <argument name="symbol"> + <description> + A <refclhs>symbol</refclhs> identifying an attribute supported by + <arg0/>. + </description> + </argument> + </arguments> + <return> + <emphasis>object</emphasis> + </return> + </syntax> + <description> + Each <reftopic>gfw:layout-manager</reftopic> subclass can support attributes + that apply to each child of <arg1/>, which this function allows to be set + or retrieved. After setting attribute values, call <reftopic>gfw:layout</reftopic> + on <arg1/>. + </description> + </function> + <function name="default-message-filter"> <syntax> <arguments> @@ -2113,6 +2188,65 @@ </description> </function> + <function name="obtain-file-dialog-paths"> + <syntax> + <arguments> + <argument name="file-dialog"> + <description> + The <reftopic>gfw:file-dialog</reftopic> to query. + </description> + </argument> + </arguments> + <return> + <refclhs>list</refclhs> + </return> + </syntax> + <description> + Interrogates the data structure associated with <arg0/> to obtain the + <refclhs>namestring</refclhs>s for selected files. This return value is + NIL if the user cancelled the dialog. Use this function when manually + constructing a file dialog. + </description> + <seealso> + <reftopic>gfw:with-file-dialog</reftopic> + </seealso> + </function> + + <function name="obtain-font-dialog-results"> + <syntax> + <arguments> + <argument name="font-dialog"> + <description> + The <reftopic>gfw:font-dialog</reftopic> to query. + </description> + </argument> + <argument name="graphic-context"> + <description> + A <reftopic>gfg:graphic-context</reftopic> object. + </description> + </argument> + </arguments> + <return> + <reftopic>gfg:font</reftopic> + <reftopic>gfg:color</reftopic> + </return> + </syntax> + <description> + Interrogates the data structure associated with an instance of + <reftopic>gfw:font-dialog</reftopic> to obtain the font and color + corresponding to selections made by the user. <arg1/> should be the + same context with which the dialog was created. If the user cancelled + the dialog, the <emphasis>font</emphasis> + and <emphasis>color</emphasis> values will be NIL. Also, the + <emphasis>color</emphasis> value will be NIL if the dialog was created + with the :no-effects style keyword. Use this function when manually + constructing a font dialog. + </description> + <seealso> + <reftopic>gfw:with-font-dialog</reftopic> + </seealso> + </function> + <!-- GENERIC FUNCTIONS --> <generic-function name="event-activate"> Modified: trunk/src/packages.lisp ============================================================================== --- trunk/src/packages.lisp (original) +++ trunk/src/packages.lisp Sat Oct 21 12:56:48 2006 @@ -425,10 +425,8 @@ #:event-timer #:expand #:expanded-p - #:file-dialog-paths #:focus-index #:focus-p - #:font-dialog-results #:foreground-color #:give-focus #:grid-line-width @@ -474,6 +472,8 @@ #:obtain-chosen-color #:obtain-displays #:obtain-event-time + #:obtain-file-dialog-paths + #:obtain-font-dialog-results #:obtain-horizontal-scrollbar #:obtain-primary-display #:obtain-vertical-scrollbar Modified: trunk/src/uitoolkit/widgets/file-dialog.lisp ============================================================================== --- trunk/src/uitoolkit/widgets/file-dialog.lisp (original) +++ trunk/src/uitoolkit/widgets/file-dialog.lisp Sat Oct 21 12:56:48 2006 @@ -37,7 +37,7 @@ ;;; helper functions ;;; -(defun file-dialog-paths (dlg) +(defun obtain-file-dialog-paths (dlg) (let ((ofn-ptr (gfs:handle dlg))) (if (cffi:null-pointer-p ofn-ptr) (error 'gfs:disposed-error)) @@ -65,7 +65,7 @@ (unwind-protect (progn (show ,dlg t) - (setf ,paths (file-dialog-paths ,dlg)) + (setf ,paths (obtain-file-dialog-paths ,dlg)) ,@body) (gfs:dispose ,dlg))))) Modified: trunk/src/uitoolkit/widgets/font-dialog.lisp ============================================================================== --- trunk/src/uitoolkit/widgets/font-dialog.lisp (original) +++ trunk/src/uitoolkit/widgets/font-dialog.lisp Sat Oct 21 12:56:48 2006 @@ -39,7 +39,7 @@ ;;; helper functions ;;; -(defun font-dialog-results (dlg gc) +(defun obtain-font-dialog-results (dlg gc) (if (or (gfs:disposed-p dlg) (gfs:disposed-p gc)) (error 'gfs:disposed-error)) (cffi:with-foreign-slots ((gfs::logfont gfs::color) (gfs:handle dlg) gfs::choosefont) @@ -66,7 +66,7 @@ :style ,style))) (unwind-protect (unless (zerop (show ,dlg t)) - (multiple-value-bind (f c) (font-dialog-results ,dlg ,gc) + (multiple-value-bind (f c) (obtain-font-dialog-results ,dlg ,gc) (setf ,font f) (setf ,color c)) ,@body)