Menu
▾
▴
[Win32forth-cvs] win32forth/src CONTROL.F, 1.12, 1.13 Dialog.f, 1.6, 1.7 GENERIC.F, 1.26, 1.27 Window.f, 1.26, 1.27
|
From: George H. <geo...@us...> - 2012-06-09 18:45:50
|
Update of /cvsroot/win32forth/win32forth/src
In directory vz-cvs-4.sog:/tmp/cvs-serv20140
Modified Files:
CONTROL.F Dialog.f GENERIC.F Window.f
Log Message:
Removed temporary class dialog&control
Index: Window.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/Window.f,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** Window.f 14 Sep 2011 13:35:08 -0000 1.26
--- Window.f 9 Jun 2012 18:45:47 -0000 1.27
***************
*** 73,84 ****
\ left it here in order not to break too much code (Sonntag, Juni 04 2006 dbu).
int hWndParent \ handle of the parent window (added Sonntag, Juni 04 2006 dbu)
! int mydialoglink
\ The following is for backward compatibility. Use WinRect for new code since it will
\ be early bound whereas wRect will be latebound.
! int wRect
! Rectangle WinRect
synonym WndRect wrect
- synonym TempRect wrect
:M ClassInit: ( -- )
--- 73,82 ----
\ left it here in order not to break too much code (Sonntag, Juni 04 2006 dbu).
int hWndParent \ handle of the parent window (added Sonntag, Juni 04 2006 dbu)
! \ int mydialoglink
\ The following is for backward compatibility. Use WinRect for new code since it will
\ be early bound whereas wRect will be latebound.
!
synonym WndRect wrect
:M ClassInit: ( -- )
***************
*** 103,116 ****
['] noop to track-func
WindowClassName MAXSTRING erase \ clear the class name
! addr: WinRect to wRect
;M
\ Temporarily moved here to overcome problem with offset of ints
! : +DialogList ( -- ) \ link into dialog list
! (dialoglock) Dialog-link link,
! self , Dialog-link @ (dialogunlock) to mydialoglink ;
!
! : -DialogList ( -- ) \ Unlink from dialog list
! (dialoglock) mydialoglink Dialog-link un-link drop (dialogunlock) ;
\ -----------------------------------------------------------------
--- 101,114 ----
['] noop to track-func
WindowClassName MAXSTRING erase \ clear the class name
! \ addr: WinRect to wRect
;M
\ Temporarily moved here to overcome problem with offset of ints
! \ : +DialogList ( -- ) \ link into dialog list
! \ (dialoglock) Dialog-link link,
! \ self , Dialog-link @ (dialogunlock) to mydialoglink ;
! \
! \ : -DialogList ( -- ) \ Unlink from dialog list
! \ (dialoglock) mydialoglink Dialog-link un-link drop (dialogunlock) ;
\ -----------------------------------------------------------------
Index: Dialog.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/Dialog.f,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Dialog.f 17 May 2007 11:10:22 -0000 1.6
--- Dialog.f 9 Jun 2012 18:45:47 -0000 1.7
***************
*** 80,84 ****
\ *W <a name="Dialog"></a>
\ *S Dialog Class
! :CLASS Dialog <SUPER Dialog&Control
\ *G Dialog class. \n
\ ** To use this class you have to create a ressource file (*.res) which must contain
--- 80,84 ----
\ *W <a name="Dialog"></a>
\ *S Dialog Class
! :CLASS Dialog <SUPER Generic-Window
\ *G Dialog class. \n
\ ** To use this class you have to create a ressource file (*.res) which must contain
Index: CONTROL.F
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/CONTROL.F,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** CONTROL.F 21 Jul 2011 18:26:21 -0000 1.12
--- CONTROL.F 9 Jun 2012 18:45:47 -0000 1.13
***************
*** 80,84 ****
\ *W <a name="Control"></a>
\ *S Generic Control class
! :Class Control <Super Dialog&Control
\ *G Generic control class. \n
\ ** Since Control is a generic class it should not be used to create
--- 80,84 ----
\ *W <a name="Control"></a>
\ *S Generic Control class
! :Class Control <Super Generic-Window
\ *G Generic control class. \n
\ ** Since Control is a generic class it should not be used to create
Index: GENERIC.F
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/GENERIC.F,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** GENERIC.F 3 Mar 2012 09:15:14 -0000 1.26
--- GENERIC.F 9 Jun 2012 18:45:47 -0000 1.27
***************
*** 112,115 ****
--- 112,126 ----
\ *G handle to Win32 window object
+ int mydialoglink
+
+ \ The following is for backward compatibility. Use WinRect for new code since it will
+ \ be early bound whereas wRect will be latebound.
+
+ Rectangle WinRect
+
+ int wRect
+
+ synonym tempRect wRect
+
\ -----------------------------------------------------------------
\ -----------------------------------------------------------------
***************
*** 157,160 ****
--- 168,173 ----
0 to hWnd turnkeyed? 0= \ only dynamic windows can be used in a
\in-system-ok if link-window then \ turnkeyed application so skip linking
+ 0 to mydialoglink \ added Sonntag, Juni 04 2006 dbu
+ addr: WinRect to wRect
;M
***************
*** 277,291 ****
;M
- ((
:M GetWindowRect: ( -- left top right bottom )
hWnd
! if EraseRect: WinRect
! AddrOf: WinRect hWnd Call GetWindowRect ?win-error
! Left: WinRect Top: WinRect
! Right: WinRect Bottom: WinRect
! else 0 0 0 0
! then
! ;M
! ))
:M SetMenu: ( MenuHandle -- )
--- 290,304 ----
;M
:M GetWindowRect: ( -- left top right bottom )
+ \ *G The GetWindowRect method retrieves the dimensions of the bounding rectangle of the window.
+ \ ** The dimensions are given in screen coordinates that are relative to the upper-left corner
+ \ ** of the screen.
hWnd
! if EraseRect: WinRect
! AddrOf: WinRect hWnd Call GetWindowRect ?win-error
! Left: WinRect Top: WinRect
! Right: WinRect Bottom: WinRect
! else 0 0 0 0
! then ;M
:M SetMenu: ( MenuHandle -- )
***************
*** 604,608 ****
1 -rot WM_SETFONT swap SendDlgItemMessage: self ;M
- ((
\ The following definitions are for handling Dialog messages and have been moved
\ here rather than have multiple copies of the code in different descendants
--- 617,620 ----
***************
*** 613,617 ****
: -DialogList ( -- ) \ Unlink from dialog list
(dialoglock) mydialoglink Dialog-link un-link drop (dialogunlock) ;
! ))
: DoDialogMsg { pMsg flag -- pMsg f | pMsg FALSE }
(dialoglock)
--- 625,629 ----
: -DialogList ( -- ) \ Unlink from dialog list
(dialoglock) mydialoglink Dialog-link un-link drop (dialogunlock) ;
!
: DoDialogMsg { pMsg flag -- pMsg f | pMsg FALSE }
(dialoglock)
***************
*** 643,693 ****
pre-save-image-chain chain-add zero-image-windows
- \ *W <a name="DIALOG&CONTROL"></a>
- \ *S Generic class for Dialog- and Control-Window objects.
- |CLASS DIALOG&CONTROL <SUPER Generic-Window
- \ *G Base class for all dialog and control objects.
- \ *P Since DIALOG&CONTROL is a generic class it should not be used to create
- \ ** any instances.
-
- in-application
-
- int mydialoglink
-
- \ The following is for backward compatibility. Use WinRect for new code since it will
- \ be early bound whereas wRect will be latebound.
-
- int wRect
- Rectangle WinRect
- synonym tempRect wRect \ Can't be made a colon def - [cdo-2008May13]
-
- :M Classinit: ( -- )
- \ *G Initialise the class.
- ClassInit: super
- 0 to mydialoglink \ added Sonntag, Juni 04 2006 dbu
- addr: WinRect to wRect
- ;M
-
- :M GetWindowRect: ( -- left top right bottom )
- \ *G The GetWindowRect method retrieves the dimensions of the bounding rectangle of the window.
- \ ** The dimensions are given in screen coordinates that are relative to the upper-left corner
- \ ** of the screen.
- hWnd
- if EraseRect: WinRect
- AddrOf: WinRect hWnd Call GetWindowRect ?win-error
- Left: WinRect Top: WinRect
- Right: WinRect Bottom: WinRect
- else 0 0 0 0
- then ;M
-
- \ Temporarily moved here to overcome problem with offset of ints in Window.f
- : +DialogList ( -- ) \ link into dialog list
- (dialoglock) Dialog-link link,
- self , Dialog-link @ (dialogunlock) to mydialoglink ;
-
- : -DialogList ( -- ) \ Unlink from dialog list
- (dialoglock) mydialoglink Dialog-link un-link drop (dialogunlock) ;
-
- ;CLASS
- \ *G End of DIALOG&CONTROL class
-
\ *Z
--- 655,657 ----
|
