[graphic-forms-cvs] r136 - in trunk: . src/uitoolkit/system src/uitoolkit/widgets

[junrue at common-lisp.net]

Author: junrue
Date: Wed May 17 23:44:34 2006
New Revision: 136

Modified:
   trunk/build.lisp
   trunk/src/uitoolkit/system/gdi32.lisp
   trunk/src/uitoolkit/widgets/control.lisp
   trunk/src/uitoolkit/widgets/window.lisp
Log:
fixes for minor issues revealed by testing

Modified: trunk/build.lisp
==============================================================================
--- trunk/build.lisp	(original)
+++ trunk/build.lisp	Wed May 17 23:44:34 2006
@@ -45,7 +45,7 @@
 (defvar *project-root*      "c:/projects/public/")
 
 (setf   *cells-dir*         (concatenate 'string *asdf-repo-root* "cells/"))
-(setf   *cffi-dir*          (concatenate 'string *asdf-repo-root* "cffi-0.9.0/"))
+(setf   *cffi-dir*          (concatenate 'string *asdf-repo-root* "cffi-0.9.1/"))
 (setf   *closer-mop-dir*    (concatenate 'string *asdf-repo-root* "closer-mop/"))
 (setf   *lw-compat-dir*     (concatenate 'string *asdf-repo-root* "lw-compat/"))
 (setf   *gf-dir*            (concatenate 'string *project-root* "graphic-forms/"))

Modified: trunk/src/uitoolkit/system/gdi32.lisp
==============================================================================
--- trunk/src/uitoolkit/system/gdi32.lisp	(original)
+++ trunk/src/uitoolkit/system/gdi32.lisp	Wed May 17 23:44:34 2006
@@ -40,7 +40,7 @@
 (load-foreign-library "msimg32.dll")
 
 (defcfun
-  ("AddFontResourceExA" add-font-resource-ex)
+  ("AddFontResourceExA" add-font-resource)
   INT
   (filename :string)
   (flags DWORD)
@@ -341,9 +341,11 @@
   (y2 INT))
 
 (defcfun
-  ("RemoveFontResourceA" remove-font-resource)
+  ("RemoveFontResourceExA" remove-font-resource)
   BOOL
-  (filename :string))
+  (filename :string)
+  (flags DWORD)
+  (reserved LPTR))
 
 (defcfun
   ("RoundRect" round-rect)

Modified: trunk/src/uitoolkit/widgets/control.lisp
==============================================================================
--- trunk/src/uitoolkit/widgets/control.lisp	(original)
+++ trunk/src/uitoolkit/widgets/control.lisp	Wed May 17 23:44:34 2006
@@ -134,7 +134,7 @@
 
 (defmethod give-focus ((ctrl control))
   (if (gfs:null-handle-p (gfs::set-focus (gfs:handle ctrl)))
-    (error 'gfs:toolkit-error "set-focus failed")))
+    (error 'gfs:win32-error :detail "set-focus failed")))
 
 (defmethod initialize-instance :after ((ctrl control) &key callback callbacks disp parent &allow-other-keys)
   (if (gfs:disposed-p parent)

Modified: trunk/src/uitoolkit/widgets/window.lisp
==============================================================================
--- trunk/src/uitoolkit/widgets/window.lisp	(original)
+++ trunk/src/uitoolkit/widgets/window.lisp	Wed May 17 23:44:34 2006
@@ -181,7 +181,7 @@
                                             (gfs::get-window-long hwnd gfs::+gwl-style+)
                                             (if (cffi:null-pointer-p (gfs::get-menu hwnd)) 0 1)
                                             (gfs::get-window-long hwnd gfs::+gwl-exstyle+)))
-          (error 'gfs:toolkit-error :detail "adjust-window-rect failed"))
+          (error 'gfs:win32-error :detail "adjust-window-rect failed"))
         (setf (gfs:size-width new-size)  (- gfs::right gfs::left)
               (gfs:size-height new-size) (- gfs::bottom gfs::top))))
     new-size))
@@ -217,7 +217,7 @@
 
 (defmethod give-focus ((win window))
   (if (gfs:null-handle-p (gfs::set-focus (gfs:handle win)))
-    (error 'gfs:toolkit-error "set-focus failed")))
+    (error 'gfs:win32-error :detail "set-focus failed")))
 
 (defmethod location ((win window))
   (if (gfs:disposed-p win)