From 035b49cbadb43902a7462795a873bd17a5dec891 Mon Sep 17 00:00:00 2001
From: Andreas Fuchs <asf@boinkor.net>
Date: Mon, 29 Jun 2009 12:28:30 +0200
Subject: [PATCH] Move the SIZE_* definitions to a place where they will be
 picked up while compiling.

---
 ChangeLog.n             |  8 ++++----
 aclpc/acl-class.lisp    | 10 ++++++++--
 pre-silica/wheader.lisp |  6 ------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ChangeLog.n b/ChangeLog.n
index e9d82f00..089b12ff 100644
--- a/ChangeLog.n
+++ b/ChangeLog.n
@@ -16,12 +16,12 @@ user visible.
 
 2009-06-29  Andreas Fuchs  <afuchs@franz.com>
 
-	* pre-silica/wheader.lisp: define WM_SIZE message constants. (spr35138)
-	* silica/layout.lisp: Define sheet-flags / (setf sheet-flags).
+	* silica/layout.lisp: Define sheet-flags / (setf sheet-flags). (spr35138)
 	* aclpc/acl-mirror.lisp: Add maximized-p/minimized-p slots to
 	  acl-top-level-sheet.
-	* aclpc/acl-class.lisp: Add implementations for sheet-flags accessors, listen
-	  for minimized/maximized events and set top-level sheet flags accordingly.
+	* aclpc/acl-class.lisp: define WM_SIZE message constants,
+	  add implementations for sheet-flags accessors, listen for
+	  minimized/maximized events and set top-level sheet flags accordingly.
 	
 2009-06-29  Andreas Fuchs  <afuchs@franz.com>
 
diff --git a/aclpc/acl-class.lisp b/aclpc/acl-class.lisp
index 3f3ca0a3..eaa41f0a 100644
--- a/aclpc/acl-class.lisp
+++ b/aclpc/acl-class.lisp
@@ -463,6 +463,12 @@
       (setf (win-result *acl-port*) (win:DefWindowProc window msg wparam lparam)))
     (win-result *acl-port*)))
 
+#| WM_SIZE message constants |#
+
+(defconstant SIZE_MAXIMIZED 2)
+(defconstant SIZE_MINIMIZED 1)
+(defconstant SIZE_RESTORED  0)
+
 ;; Process WM_SIZE
 (defun onsize (window msg wparam lparam)
   (let* ((sheet (mirror->sheet *acl-port* window)))
@@ -477,8 +483,8 @@
 	  (clear-winproc-result (win-result *acl-port*)))
         (setf (win-result *acl-port*) (win:DefWindowProc window msg wparam lparam)))
     (when (typep sheet 'acl-top-level-sheet)
-      (setf (maximized-p sheet) (= wparam win::SIZE_MAXIMIZED))
-      (setf (minimized-p sheet) (= wparam win::SIZE_MINIMIZED)))
+      (setf (maximized-p sheet) (= wparam SIZE_MAXIMIZED))
+      (setf (minimized-p sheet) (= wparam SIZE_MINIMIZED)))
     (win-result *acl-port*)))
 
 ;; Process WM_GETMINMAXINFO
diff --git a/pre-silica/wheader.lisp b/pre-silica/wheader.lisp
index 36d8f798..996d3d9c 100644
--- a/pre-silica/wheader.lisp
+++ b/pre-silica/wheader.lisp
@@ -77,12 +77,6 @@
 (defconstant SW_SHOWMINNOACTIVE	7)
 (defconstant SW_SHOWNA		8)
 
-#| WM_SIZE message constants |#
-
-(defconstant SIZE_MAXIMIZED 2)
-(defconstant SIZE_MINIMIZED 1)
-(defconstant SIZE_RESTORED  0)
-
 #||
 #| Old showwindow commands |#
 
-- 
GitLab