[graphic-forms-cvs] r196 - trunk/src/uitoolkit/system

[junrue at common-lisp.net]

Author: junrue
Date: Thu Jul 13 13:46:23 2006
New Revision: 196

Modified:
   trunk/src/uitoolkit/system/comdlg32.lisp
   trunk/src/uitoolkit/system/system-constants.lisp
   trunk/src/uitoolkit/system/system-types.lisp
   trunk/src/uitoolkit/system/user32.lisp
Log:
preparation for implementing standard find/replace dialog

Modified: trunk/src/uitoolkit/system/comdlg32.lisp
==============================================================================
--- trunk/src/uitoolkit/system/comdlg32.lisp	(original)
+++ trunk/src/uitoolkit/system/comdlg32.lisp	Thu Jul 13 13:46:23 2006
@@ -41,18 +41,28 @@
 (defcfun
   ("ChooseFontA" choose-font)
   BOOL
-  (struct LPTR))
+  (struct LPTR)) ; choosefont struct
 
 (defcfun
   ("CommDlgExtendedError" comm-dlg-extended-error)
   DWORD)
 
 (defcfun
+  ("FindTextA" find-text)
+  HANDLE
+  (fr LPTR)) ; findreplace struct
+
+(defcfun
   ("GetOpenFileNameA" get-open-filename)
   BOOL
-  (ofn LPTR))
+  (ofn LPTR)) ; openfilename struct
 
 (defcfun
   ("GetSaveFileNameA" get-save-filename)
   BOOL
-  (ofn LPTR))
+  (ofn LPTR)) ; openfilename struct
+
+(defcfun
+  ("ReplaceTextA" replace-text)
+  HANDLE
+  (fr LPTR)) ; findreplace struct

Modified: trunk/src/uitoolkit/system/system-constants.lisp
==============================================================================
--- trunk/src/uitoolkit/system/system-constants.lisp	(original)
+++ trunk/src/uitoolkit/system/system-constants.lisp	Thu Jul 13 13:46:23 2006
@@ -33,10 +33,24 @@
 
 (in-package :graphic-forms.uitoolkit.system)
 
+;;;
+;;; control class names
+;;;
 (defconstant +button-classname+          "button")
 (defconstant +edit-classname+              "edit")
 (defconstant +static-classname+          "static")
 
+;;;
+;;; registered message names
+;;;
+(defconstant +lbselchstringa+ "commdlg_LBSelChangedNotify")
+(defconstant +sharevistringa+     "commdlg_ShareViolation")
+(defconstant +fileokstringa+          "commdlg_FileNameOK")
+(defconstant +colorokstringa+            "commdlg_ColorOK")
+(defconstant +setrgbstringa+         "commdlg_SetRGBColor")
+(defconstant +helpmsgstringa+               "commdlg_help")
+(defconstant +findmsgstringa+        "commdlg_FindReplace")
+
 (defconstant +ad-counterclockwise+              1)
 (defconstant +ad-clockwise+                     2)
 
@@ -374,6 +388,31 @@
 (defconstant +fr-private+                    #x10)
 (defconstant +fr-not-enum+                   #x20)
 
+;;;
+;;; find/replace dialog-related constants
+;;;
+(defconstant +fr-down+                 #x00000001)
+(defconstant +fr-wholeword+            #x00000002)
+(defconstant +fr-matchcase+            #x00000004)
+(defconstant +fr-findnext+             #x00000008)
+(defconstant +fr-replace+              #x00000010)
+(defconstant +fr-replaceall+           #x00000020)
+(defconstant +fr-dialogterm+           #x00000040)
+(defconstant +fr-showhelp+             #x00000080)
+(defconstant +fr-enablehook+           #x00000100)
+(defconstant +fr-enabletemplate+       #x00000200)
+(defconstant +fr-noupdown+             #x00000400)
+(defconstant +fr-nomatchcase+          #x00000800)
+(defconstant +fr-nowholeword+          #x00001000)
+(defconstant +fr-enabletemplatehandle+ #x00002000)
+(defconstant +fr-hideupdown+           #x00004000)
+(defconstant +fr-hidematchcase+        #x00008000)
+(defconstant +fr-hidewholeword+        #x00010000)
+(defconstant +fr-raw+                  #x00020000)
+(defconstant +fr-matchdiac+            #x20000000)
+(defconstant +fr-matchkashida+         #x40000000)
+(defconstant +fr-matchalefhamza+       #x80000000)
+
 (defconstant +frerr-findreplacecodes+      #x4000)
 (defconstant +frerr-bufferlengthzero+      #x4001)
 

Modified: trunk/src/uitoolkit/system/system-types.lisp
==============================================================================
--- trunk/src/uitoolkit/system/system-types.lisp	(original)
+++ trunk/src/uitoolkit/system/system-types.lisp	Thu Jul 13 13:46:23 2006
@@ -151,6 +151,19 @@
   (rightmargin INT)
   (lengthdrawn UINT))
 
+(defcstruct findreplace
+  (structsize DWORD)
+  (howner     HANDLE)
+  (hinst      HANDLE)
+  (flags      DWORD)
+  (whatstr    :string)
+  (withstr    :string)
+  (whatlen    WORD)
+  (withlen    WORD)
+  (data       LPARAM)
+  (hookfn     LPTR) ; FIXME: not yet used, but eventually should be FRHookProc
+  (templname  :string))
+
 (defcstruct initcommoncontrolsex
   (size DWORD)
   (icc DWORD))

Modified: trunk/src/uitoolkit/system/user32.lisp
==============================================================================
--- trunk/src/uitoolkit/system/user32.lisp	(original)
+++ trunk/src/uitoolkit/system/user32.lisp	Thu Jul 13 13:46:23 2006
@@ -541,6 +541,11 @@
   (wndclass LPTR))
 
 (defcfun
+  ("RegisterWindowMessageA" register-window-message)
+  UINT
+  (str :string))
+
+(defcfun
   ("ReleaseCapture" release-capture)
   BOOL)