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

[junrue at common-lisp.net]

Author: junrue
Date: Sat May 20 22:56:05 2006
New Revision: 138

Modified:
   trunk/build.lisp
   trunk/src/uitoolkit/graphics/magick-core-api.lisp
   trunk/src/uitoolkit/system/system-constants.lisp
   trunk/src/uitoolkit/widgets/heap-layout.lisp
Log:
get rid of defvars that are bound to (cffi:null-pointer) as that causes problems in saved images; updated to 060514 drop of CFFI

Modified: trunk/build.lisp
==============================================================================
--- trunk/build.lisp	(original)
+++ trunk/build.lisp	Sat May 20 22:56:05 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.1/"))
+(setf   *cffi-dir*          (concatenate 'string *asdf-repo-root* "cffi-060514/"))
 (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/graphics/magick-core-api.lisp
==============================================================================
--- trunk/src/uitoolkit/graphics/magick-core-api.lisp	(original)
+++ trunk/src/uitoolkit/graphics/magick-core-api.lisp	Sat May 20 22:56:05 2006
@@ -37,33 +37,19 @@
   (use-package :cffi)
   (pushnew cl-user::*magick-library-directory* cffi:*foreign-library-directories* :test #'equal))
 
-(define-foreign-library wsock32        (t (:default "wsock32")))
-(define-foreign-library msvcr71        (t (:default "msvcr71")))
-(define-foreign-library x11            (t (:default "x11")))
-(define-foreign-library core_rl_bzlib  (t (:default "CORE_RL_bzlib_")))
-(define-foreign-library core_rl_jbig   (t (:default "CORE_RL_jbig_")))
-(define-foreign-library core_rl_jpeg   (t (:default "CORE_RL_jpeg_")))
-(define-foreign-library core_rl_lcms   (t (:default "CORE_RL_lcms_")))
-(define-foreign-library core_rl_zlib   (t (:default "CORE_RL_zlib_")))
-(define-foreign-library core_rl_png    (t (:default "CORE_RL_png_")))
-(define-foreign-library core_rl_tiff   (t (:default "CORE_RL_tiff_")))
-(define-foreign-library core_rl_ttf    (t (:default "CORE_RL_ttf_")))
-(define-foreign-library core_rl_xlib   (t (:default "CORE_RL_xlib_")))
-(define-foreign-library core_rl_magick (t (:default "CORE_RL_magick_")))
-
-(use-foreign-library wsock32)
-(use-foreign-library msvcr71)
-(use-foreign-library x11)
-(use-foreign-library core_rl_bzlib)
-(use-foreign-library core_rl_jbig)
-(use-foreign-library core_rl_jpeg)
-(use-foreign-library core_rl_lcms)
-(use-foreign-library core_rl_zlib)
-(use-foreign-library core_rl_png)
-(use-foreign-library core_rl_tiff)
-(use-foreign-library core_rl_ttf)
-(use-foreign-library core_rl_xlib)
-(use-foreign-library core_rl_magick)
+(load-foreign-library "wsock32.dll")
+(load-foreign-library "msvcr71.dll")
+(load-foreign-library "x11.dll")
+(load-foreign-library "CORE_RL_bzlib_.dll")
+(load-foreign-library "CORE_RL_jbig_.dll")
+(load-foreign-library "CORE_RL_jpeg_.dll")
+(load-foreign-library "CORE_RL_lcms_.dll")
+(load-foreign-library "CORE_RL_zlib_.dll")
+(load-foreign-library "CORE_RL_png_.dll")
+(load-foreign-library "CORE_RL_tiff_.dll")
+(load-foreign-library "CORE_RL_ttf_.dll")
+(load-foreign-library "CORE_RL_xlib_.dll")
+(load-foreign-library "CORE_RL_magick_.dll")
 
 ;;;
 ;;; translated from constitute.h

Modified: trunk/src/uitoolkit/system/system-constants.lisp
==============================================================================
--- trunk/src/uitoolkit/system/system-constants.lisp	(original)
+++ trunk/src/uitoolkit/system/system-constants.lisp	Sat May 20 22:56:05 2006
@@ -33,14 +33,6 @@
 
 (in-package :graphic-forms.uitoolkit.system)
 
-;;;
-;;; The following variables are used with set-window-pos
-;;;
-(defvar *hwnd-top*       (cffi:null-pointer))
-(defvar *hwnd-bottom*    (cffi:make-pointer  #x00000001))
-(defvar *hwnd-topmost*   (cffi:make-pointer  #xFFFFFFFF))
-(defvar *hwnd-notopmost* (cffi:make-pointer  #xFFFFFFFE))
-
 (defconstant +button-classname+          "button")
 (defconstant +static-classname+          "static")
 

Modified: trunk/src/uitoolkit/widgets/heap-layout.lisp
==============================================================================
--- trunk/src/uitoolkit/widgets/heap-layout.lisp	(original)
+++ trunk/src/uitoolkit/widgets/heap-layout.lisp	Sat May 20 22:56:05 2006
@@ -82,8 +82,7 @@
                       (hwnd-after (cffi:null-pointer))
                       (flags (logior +window-pos-flags+ gfs::+swp-hidewindow+)))
                  (when (cffi:pointer-eq (gfs:handle kid-win) (gfs:handle top))
-                   (setf hwnd-after gfs::*hwnd-top*
-                         flags (logior +window-pos-flags+ gfs::+swp-showwindow+)))
+                   (setf flags (logior +window-pos-flags+ gfs::+swp-showwindow+)))
                  (if (gfs:null-handle-p hdwp)
                    (gfs::set-window-pos (gfs:handle kid-win)
                                         hwnd-after