[graphic-forms-cvs] r346 - in trunk: docs/manual src/uitoolkit/widgets - graphic-forms-cvs@common-lisp.net - mailman3.common-lisp.net

18 Oct 2006

Author: junrue
Date: Wed Oct 18 14:16:10 2006
New Revision: 346
Added:
   trunk/docs/manual/gfs-symbols.xml
Removed:
   trunk/docs/manual/gfs-function-data.xml
   trunk/docs/manual/gfs-type-data.xml
Modified:
   trunk/docs/manual/Makefile
   trunk/docs/manual/clhs-table.xml
   trunk/docs/manual/gf-data.xsl
   trunk/docs/manual/graphic-forms.xml
   trunk/docs/manual/system-package.xml
   trunk/docs/manual/win32-api-table.xml
   trunk/src/uitoolkit/widgets/scrolling-event-dispatcher.lisp
Log:
Modified: trunk/docs/manual/Makefile
==============================================================================

--- trunk/docs/manual/Makefile	(original)
+++ trunk/docs/manual/Makefile	Wed Oct 18 14:16:10 2006
@@ -7,22 +7,19 @@
COMMON-DEPS = gf-data.xsl clhs-table.xml win32-api-table.xml
-INTERIM-XML = system-types.xml system-functions.xml
+TMP-XML     = gfs-tmp.xml
XSLT-PROC   = xsltproc --nonet
-docs: system-types.xml system-functions.xml
+docs: gfs-tmp.xml
    $(XSLT-PROC) graphic-forms.xsl graphic-forms.xml
    -hhc htmlhelp.hhp
-system-types.xml: gfs-type-data.xml $(COMMON-DEPS)
-	$(XSLT-PROC) --output $@ gf-data.xsl gfs-type-data.xml
-
-system-functions.xml: gfs-function-data.xml $(COMMON-DEPS)
-	$(XSLT-PROC) --output $@ gf-data.xsl gfs-function-data.xml
+gfs-tmp.xml: gfs-symbols.xml $(COMMON-DEPS)
+	$(XSLT-PROC) --output $@ gf-data.xsl gfs-symbols.xml
clean:
-	rm -f $(INTERIM-XML)
+	rm -f $(TMP-XML)
    find . ( -name "*~" -o -name "*.html" -o -name "*.hhk" -o -name "*.hhc" -o -name "*.hhp" ) -exec rm {} ;
scrub: clean
Modified: trunk/docs/manual/clhs-table.xml
==============================================================================
--- trunk/docs/manual/clhs-table.xml	(original)
+++ trunk/docs/manual/clhs-table.xml	Wed Oct 18 14:16:10 2006
@@ -6,7 +6,8 @@
 -->
<clhs-table>
-  <entry name="error"  url="http://www.lispworks.com/documentation/HyperSpec/Body/e_error.htm"/>
-  <entry name="list"   url="http://www.lispworks.com/documentation/HyperSpec/Body/t_list.htm"/>
-  <entry name="string" url="http://www.lispworks.com/documentation/HyperSpec/Body/t_string.htm"/>
+  <entry name="error"   url="http://www.lispworks.com/documentation/HyperSpec/Body/e_error.htm"/>
+  <entry name="list"    url="http://www.lispworks.com/documentation/HyperSpec/Body/t_list.htm"/>
+  <entry name="string"  url="http://www.lispworks.com/documentation/HyperSpec/Body/t_string.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	Wed Oct 18 14:16:10 2006
@@ -40,7 +40,9 @@
           <xsl:attribute name="colwidth"><xsl:value-of select="$col2-width"/></xsl:attribute>
         </xsl:element>
         <xsl:element name="tbody">
-          xsl:apply-templates/
+          xsl:apply-templates
+            <xsl:sort select="@name" order="ascending" case-order="upper-first"/>
+          </xsl:apply-templates>
         </xsl:element>
       </xsl:element>
     </xsl:element>
@@ -51,6 +53,7 @@
<xsl:element name="para">
         <xsl:attribute name="role">normal</xsl:attribute>
+        [<xsl:value-of select="../@name"/>]
         <xsl:value-of select="$page-type"/>
       </xsl:element>
   </xsl:template>
@@ -180,6 +183,13 @@
       <xsl:attribute name="renderas">sect2</xsl:attribute>
       initargs
     </xsl:element>
+    <xsl:for-each select="argument">
+      <xsl:element name="indexterm">
+        <xsl:element name="primary">
+          <xsl:value-of select="@name"/>
+        </xsl:element>
+      </xsl:element>
+    </xsl:for-each>
     <xsl:call-template name="emit-table">
       <xsl:with-param name="col2-width">5*</xsl:with-param>
     </xsl:call-template>
@@ -283,9 +293,7 @@
<xsl:call-template name="emit-index-term"/>
-      <xsl:element name="title">
-        <xsl:call-template name="create-id"/>
-      </xsl:element>
+      <xsl:element name="title"><xsl:value-of select="@name"/></xsl:element>
<xsl:call-template name="emit-page-type">
         <xsl:with-param name="page-type">[<xsl:value-of select="$page-type"/>]</xsl:with-param>
@@ -304,9 +312,7 @@
<xsl:call-template name="emit-index-term"/>
-      <xsl:element name="title">
-        <xsl:call-template name="create-id"/>
-      </xsl:element>
+      <xsl:element name="title"><xsl:value-of select="@name"/></xsl:element>
<xsl:call-template name="emit-page-type">
         <xsl:with-param name="page-type">[<xsl:value-of select="$page-type"/>]</xsl:with-param>
@@ -318,28 +324,34 @@
     </xsl:element>
   </xsl:template>
-  <xsl:template match="/package/class">
+  <xsl:template match="class">
     <xsl:call-template name="emit-type-section">
       <xsl:with-param name="page-type">Class</xsl:with-param>
     </xsl:call-template>
   </xsl:template>
-  <xsl:template match="/package/condition">
+  <xsl:template match="condition">
     <xsl:call-template name="emit-type-section">
       <xsl:with-param name="page-type">Condition</xsl:with-param>
     </xsl:call-template>
   </xsl:template>
-  <xsl:template match="/package/slot-accessor">
+  <xsl:template match="slot-accessor">
     <xsl:call-template name="emit-function-section">
       <xsl:with-param name="page-type">Slot Accessor</xsl:with-param>
     </xsl:call-template>
   </xsl:template>
-  <xsl:template match="/package/slot-reader">
+  <xsl:template match="slot-reader">
     <xsl:call-template name="emit-function-section">
       <xsl:with-param name="page-type">Slot Reader</xsl:with-param>
     </xsl:call-template>
   </xsl:template>
+  <xsl:template match="/package">
+    xsl:apply-templates
+      <xsl:sort select="@name" order="ascending" case-order="upper-first"/>
+    </xsl:apply-templates>
+  </xsl:template>
+
 </xsl:stylesheet>
Added: trunk/docs/manual/gfs-symbols.xml
==============================================================================
--- (empty file)
+++ trunk/docs/manual/gfs-symbols.xml	Wed Oct 18 14:16:10 2006
@@ -0,0 +1,178 @@
+<?xml version="1.0"?>
+<!--
+    gfs-package-data.xml
+
+    Copyright (c) 2006, Jack D. Unrue
+-->
+
+<package name="gfs">
+
+  <condition name="toolkit-error">
+    <description>
+      <hierarchy>
+        <inherits>
+          <refclhs>error</refclhs>
+        </inherits>
+        <inheritedby>
+          <reftopic>gfs:win32-error</reftopic>
+        </inheritedby>
+      </hierarchy>
+      This error is raised to indicate invalid argument values or inconsistent
+      state.
+    </description>
+    <initargs>
+      <argument name=":detail">
+        <description>
+          A <refclhs>string</refclhs> supplying additional problem information.
+        </description>
+      </argument>
+    </initargs>
+    <seealso>
+      <reftopic>gfs:detail</reftopic>
+      <reftopic>gfs:toolkit-warning</reftopic>
+      <reftopic>gfs:win32-warning</reftopic>
+    </seealso>
+  </condition>
+
+  <condition name="toolkit-warning">
+    <description>
+      <hierarchy>
+        <inherits>
+          <refclhs>warning</refclhs>
+        </inherits>
+        <inheritedby>
+          <reftopic>gfs:win32-warning</reftopic>
+        </inheritedby>
+      </hierarchy>
+      This warning is raised to indicate non-fatal problems that nevertheless
+      may represent application logic errors.
+    </description>
+    <initargs>
+      <argument name=":detail">
+        <description>
+          A <refclhs>string</refclhs> supplying additional problem information.
+        </description>
+      </argument>
+    </initargs>
+    <seealso>
+      <reftopic>gfs:detail</reftopic>
+      <reftopic>gfs:toolkit-error</reftopic>
+      <reftopic>gfs:win32-error</reftopic>
+    </seealso>
+  </condition>
+
+  <condition name="win32-error">
+    <description>
+      <hierarchy>
+        <inherits>
+          <reftopic>gfs:toolkit-error</reftopic>
+        </inherits>
+        <inheritedby>
+          <reftopic>gfs:comdlg-error</reftopic>
+        </inheritedby>
+      </hierarchy>
+      This error is raised to indicate that a Win32 API function has failed.
+    </description>
+    <initargs>
+      <argument name=":code">
+        <description>
+          The error code returned by <refwin32api>GetLastError</refwin32api>.
+        </description>
+      </argument>
+      <argument name=":detail">
+        <description>
+          See <reftopic>gfs:toolkit-error</reftopic>.
+        </description>
+      </argument>
+    </initargs>
+    <seealso>
+      <reftopic>gfs:code</reftopic>
+      <reftopic>gfs:detail</reftopic>
+      <reftopic>gfs:toolkit-warning</reftopic>
+      <reftopic>gfs:win32-warning</reftopic>
+    </seealso>
+  </condition>
+
+  <condition name="win32-warning">
+    <description>
+      <hierarchy>
+        <inherits>
+          <reftopic>gfs:toolkit-warning</reftopic>
+        </inherits>
+      </hierarchy>
+      This warning is reported when a Win32 API function has failed in a
+      non-fatal manner which may indicate a logic error on the part of
+      the application.
+    </description>
+    <initargs>
+      <argument name=":code">
+        <description>
+          The error code returned by <refwin32api>GetLastError</refwin32api>.
+        </description>
+      </argument>
+      <argument name=":detail">
+        <description>
+          See <reftopic>gfs:toolkit-error</reftopic>.
+        </description>
+      </argument>
+    </initargs>
+    <seealso>
+      <reftopic>gfs:code</reftopic>
+      <reftopic>gfs:detail</reftopic>
+      <reftopic>gfs:toolkit-error</reftopic>
+      <reftopic>gfs:win32-error</reftopic>
+    </seealso>
+  </condition>
+
+  <condition name="comdlg-error">
+    <description>
+      <hierarchy>
+        <inherits>
+          <reftopic>gfs:win32-error</reftopic>
+        </inherits>
+      </hierarchy>
+      This error is raised to indicate that a Win32 Common Dialog API function
+      has failed.
+    </description>
+    <initargs>
+      <argument name=":dlg-code">
+        <description>
+          The error code returned by <refwin32api>CommDlgExtendedError</refwin32api>.
+        </description>
+      </argument>
+      <argument name=":code">
+        <description>
+          See <reftopic>gfs:win32-error</reftopic>.
+        </description>
+      </argument>
+      <argument name=":detail">
+        <description>
+          See <reftopic>gfs:toolkit-error</reftopic>.
+        </description>
+      </argument>
+    </initargs>
+    <seealso>
+      <reftopic>gfs:code</reftopic>
+      <reftopic>gfs:detail</reftopic>
+      <reftopic>gfs:toolkit-warning</reftopic>
+      <reftopic>gfs:win32-warning</reftopic>
+    </seealso>
+  </condition>
+
+  <slot-reader name="code">
+    <arguments>
+      <argument name="condition">
+        <description>
+          The <reftopic>gfs:win32-error</reftopic> or <reftopic>gfs:win32-warning</reftopic>
+          object to be queried.
+        </description>
+      </argument>
+    </arguments>
+    <return type="integer"/>
+    <description>
+      Returns the Win32 error code for <refargument>condition</refargument>
+      as determined by <refwin32api>GetLastError</refwin32api>.
+    </description>
+  </slot-reader>
+
+</package>
Modified: trunk/docs/manual/graphic-forms.xml
==============================================================================
--- trunk/docs/manual/graphic-forms.xml	(original)
+++ trunk/docs/manual/graphic-forms.xml	Wed Oct 18 14:16:10 2006
@@ -10,8 +10,7 @@
   <!ENTITY introduction  SYSTEM "introduction.xml">
   <!ENTITY api           SYSTEM "api.xml">
   <!ENTITY gfspkg        SYSTEM "system-package.xml">
-  <!ENTITY gfstypes      SYSTEM "system-types.xml">     <!-- generated file -->
-  <!ENTITY gfsfuncs      SYSTEM "system-functions.xml"> <!-- generated file -->
+  <!ENTITY gfssymbols    SYSTEM "gfs-tmp.xml">     <!-- generated file -->
   <!ENTITY misctopics    SYSTEM "miscellaneous-topics.xml">
   <!ENTITY imdataplugins SYSTEM "image-data-plugins.xml">
   <!ENTITY glossary      SYSTEM "glossary.xml">
@@ -19,10 +18,12 @@
<book>
   <title>Graphic-Forms</title>
-  <subtitle>Programming Reference (version 0.6)</subtitle>
+  <subtitle>
+    A Common Lisp user interface toolkit for Windows.
+  </subtitle>
<bridgehead renderas="sect2">
-    A Common Lisp user interface toolkit for the Windows platform.
+    Programming Reference (version 0.6)
   </bridgehead>
Modified: trunk/docs/manual/system-package.xml
==============================================================================
--- trunk/docs/manual/system-package.xml	(original)
+++ trunk/docs/manual/system-package.xml	Wed Oct 18 14:16:10 2006
@@ -38,7 +38,6 @@
     win32-warning
   </para>
-  &gfstypes;
-  &gfsfuncs;
+  &gfssymbols;
</chapter>
Modified: trunk/docs/manual/win32-api-table.xml
==============================================================================
--- trunk/docs/manual/win32-api-table.xml	(original)
+++ trunk/docs/manual/win32-api-table.xml	Wed Oct 18 14:16:10 2006
@@ -6,5 +6,6 @@
 -->
<win32-api-table>
-  <entry name="GetLastError" url="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/debug/base/getlasterror.asp"/>
+  <entry name="CommDlgExtendedError" url="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/winui/winui/windowsuserinterface/userinput/commondialogboxlibrary/commondialogboxreference/commondialogboxfunctions/commdlgextendederror.asp"/>
+  <entry name="GetLastError"         url="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/debug/base/getlasterror.asp"/>
 </win32-api-table>
Modified: trunk/src/uitoolkit/widgets/scrolling-event-dispatcher.lisp
==============================================================================
--- trunk/src/uitoolkit/widgets/scrolling-event-dispatcher.lisp	(original)
+++ trunk/src/uitoolkit/widgets/scrolling-event-dispatcher.lisp	Wed Oct 18 14:16:10 2006
@@ -131,7 +131,6 @@
 ;;;
(defmethod event-pre-resize ((disp scrolling-event-dispatcher) (window window) rect type)
-  (declare (ignore type))
   (let ((h-step (gfs:size-width (step-increments disp)))
         (v-step (gfs:size-height (step-increments disp)))
         (outer-size (gfw:size window))

    