[Win32forth-cvs] win32forth/src CONTROLS.F,1.7,1.8

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/win32forth/win32forth/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17632/src

Modified Files:
	CONTROLS.F 
Log Message:
- New GroupRadioButton class added; and changed ForthForm to use this class.
- Some more dexing

Index: CONTROLS.F
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/CONTROLS.F,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CONTROLS.F	22 Jan 2006 10:44:16 -0000	1.7
--- CONTROLS.F	1 Feb 2006 17:08:25 -0000	1.8
***************
*** 23,27 ****
  \ *S EditControl class
  :Class EditControl <Super CONTROL
! \ *G Class for text edit controls.
  
  \ pointers to filter function to allow key capturing.
--- 23,29 ----
  \ *S EditControl class
  :Class EditControl <Super CONTROL
! \ *G Class for Edit controls.
! \ ** An edit control is a rectangular control window typically used in a dialog
! \ ** box to permit the user to enter and edit text by typing on the keyboard.
  
  \ pointers to filter function to allow key capturing.
***************
*** 40,43 ****
--- 42,46 ----
  
  :M ClassInit:   ( -- )
+ \ *G Initialise the class.
                  ClassInit: Super
                  0 to pWmChar
***************
*** 47,55 ****
  
  :M StartSize:   ( -- width height )
! \ *G Get the start size of the control
                  100 25 ;M
  
  :M WindowStyle: ( -- Style )
! \ *G Get the window style of the control
                  WindowStyle: SUPER
                  [ WS_BORDER WS_TABSTOP OR ES_AUTOHSCROLL OR ] literal OR \ allow horizontal scrolling
--- 50,59 ----
  
  :M StartSize:   ( -- width height )
! \ *G Get the start size of the control. Default size is 100 x 25.
                  100 25 ;M
  
  :M WindowStyle: ( -- Style )
! \ *G Get the window style of the control. Default style is:
! \ ** WS_BORDER, WS_TABSTOP and ES_AUTOHSCROLL.
                  WindowStyle: SUPER
                  [ WS_BORDER WS_TABSTOP OR ES_AUTOHSCROLL OR ] literal OR \ allow horizontal scrolling
***************
*** 62,82 ****
                  ;M
  
- \ Install these filter functions if you want to capture certain keys, like
- \ Return or F3, or whatever.
- 
  :M SetWmChar:   ( pWmChar -- )
! \ *G install the WM_CHAR filter function
                  to pWmChar ;M
  
  :M SetWmKeyDown: ( pWmKeyDown -- )
! \ *G install the WM_KEYDOWN filter function
                  to pWmKeyDown ;M
  
  :M SetWmKillFocus: ( pWmKillFocus -- )
! \ *G install the WM_KILLFOCUS filter function
                  to pWmKillFocus ;M
  
  :M SubClass:    ( hWnd Parent -- )
! \ *G Subclass this control
                  to parent
                  to hWnd
--- 66,86 ----
                  ;M
  
  :M SetWmChar:   ( pWmChar -- )
! \ *G Install the WM_CHAR filter function.
                  to pWmChar ;M
  
  :M SetWmKeyDown: ( pWmKeyDown -- )
! \ *G Install the WM_KEYDOWN filter function.
                  to pWmKeyDown ;M
  
+ \ *P Install these filter functions if you want to capture certain keys, like
+ \ ** Return or F3, or whatever.
+ 
  :M SetWmKillFocus: ( pWmKillFocus -- )
! \ *G Install the WM_KILLFOCUS filter function.
                  to pWmKillFocus ;M
  
  :M SubClass:    ( hWnd Parent -- )
! \ *G Subclass this control.
                  to parent
                  to hWnd
***************
*** 139,143 ****
  
  :M WindowStyle: ( -- Style )
! \ *G Get the window style of the control
                  WindowStyle: SUPER
                  [ CBS_DROPDOWN WS_VSCROLL OR WS_TABSTOP OR WS_VISIBLE OR ES_AUTOHSCROLL OR ] literal OR
--- 143,148 ----
  
  :M WindowStyle: ( -- Style )
! \ *G Get the window style of the control. The default style is:
! \ ** CBS_DROPDOWN, WS_VSCROLL, WS_TABSTOP, WS_VISIBLE and ES_AUTOHSCROLL.
                  WindowStyle: SUPER
                  [ CBS_DROPDOWN WS_VSCROLL OR WS_TABSTOP OR WS_VISIBLE OR ES_AUTOHSCROLL OR ] literal OR
***************
*** 194,198 ****
  
  :M Start:       ( Parent -- )
! \ *G Create the control
                  TO Parent
                  z" COMBOBOX" Create-Control
--- 199,203 ----
  
  :M Start:       ( Parent -- )
! \ *G Create the control.
                  TO Parent
                  z" COMBOBOX" Create-Control
***************
*** 215,219 ****
  
  :M WindowStyle: ( -- Style )
! \ *G Get the window style of the control
                  WindowStyle: SUPER CBS_DROPDOWNLIST OR ;M
  
--- 220,224 ----
  
  :M WindowStyle: ( -- Style )
! \ *G Get the window style of the control. The default style is: CBS_DROPDOWNLIST.
                  WindowStyle: SUPER CBS_DROPDOWNLIST OR ;M
  
***************
*** 227,231 ****
  
  :M WindowStyle: ( -- Style )
! \ *G Get the window style of the control
                  WindowStyle: SUPER
                  [ WS_VSCROLL LBS_NOTIFY OR LBS_NOINTEGRALHEIGHT OR WS_TABSTOP OR ] literal OR
--- 232,237 ----
  
  :M WindowStyle: ( -- Style )
! \ *G Get the window style of the control. The default style is: WS_VSCROLL,
! \ ** LBS_NOTIFY, LBS_NOINTEGRALHEIGHT and WS_TABSTOP.
                  WindowStyle: SUPER
                  [ WS_VSCROLL LBS_NOTIFY OR LBS_NOINTEGRALHEIGHT OR WS_TABSTOP OR ] literal OR
***************
*** 233,237 ****
  
  :M Start:       ( Parent -- )
! \ *G Create the control
                  TO Parent
                  z" LISTBOX" Create-Control
--- 239,243 ----
  
  :M Start:       ( Parent -- )
! \ *G Create the control.
                  TO Parent
                  z" LISTBOX" Create-Control
***************
*** 246,257 ****
  
  :M WindowStyle: ( -- Style )
! \ *G Get the window style of the control
                  WindowStyle: SUPER BS_GROUPBOX OR ;M
  
  :M Start:       ( Parent -- )
! \ *G Create the control
!                 TO Parent
!                 z" BUTTON" Create-Control
!                 ;M
  ;Class
  \ *G End of GroupControl class
--- 252,261 ----
  
  :M WindowStyle: ( -- Style )
! \ *G Get the window style of the control. The default style is: BS_GROUPBOX.
                  WindowStyle: SUPER BS_GROUPBOX OR ;M
  
  :M Start:       ( Parent -- )
! \ *G Create the control.
!                 TO Parent z" BUTTON" Create-Control ;M
  ;Class
  \ *G End of GroupControl class
***************
*** 263,267 ****
  
  :M Start:       ( Parent -- )
! \ *G Create the control
                  TO Parent
                  z" STATIC" Create-Control
--- 267,271 ----
  
  :M Start:       ( Parent -- )
! \ *G Create the control.
                  TO Parent
                  z" STATIC" Create-Control
***************
*** 276,280 ****
  
  :M WindowStyle: ( -- style )
! \ *G Get the window style of the control
                  WindowStyle: SUPER
                  [ BS_AUTOCHECKBOX WS_TABSTOP OR ] literal OR
--- 280,285 ----
  
  :M WindowStyle: ( -- style )
! \ *G Get the window style of the control. The default style is: BS_AUTOCHECKBOX,
! \ ** and WS_TABSTOP.
                  WindowStyle: SUPER
                  [ BS_AUTOCHECKBOX WS_TABSTOP OR ] literal OR
***************
*** 282,289 ****
  
  :M Start:       ( Parent -- )
! \ *G Create the control
!                 TO Parent
!                 z" BUTTON" Create-Control
!                 ;M
  
  ;Class
--- 287,292 ----
  
  :M Start:       ( Parent -- )
! \ *G Create the control.
!                 TO Parent z" BUTTON" Create-Control ;M
  
  ;Class
***************
*** 296,300 ****
  
  :M WindowStyle: ( -- style )
! \ *G Get the window style of the control
                  WindowStyle: SUPER
                  [ BS_AUTORADIOBUTTON WS_TABSTOP OR ] literal OR
--- 299,304 ----
  
  :M WindowStyle: ( -- style )
! \ *G Get the window style of the control. The default style is: BS_AUTORADIOBUTTON,
! \ ** and WS_TABSTOP.
                  WindowStyle: SUPER
                  [ BS_AUTORADIOBUTTON WS_TABSTOP OR ] literal OR
***************
*** 302,309 ****
  
  :M Start:       ( Parent -- )
! \ *G Create the control
!                 TO Parent
!                 z" BUTTON" Create-Control
!                 ;M
  
  ;Class
--- 306,311 ----
  
  :M Start:       ( Parent -- )
! \ *G Create the control.
!                 TO Parent z" BUTTON" Create-Control ;M
  
  ;Class
***************
*** 318,321 ****
--- 320,324 ----
  
  :M ClassInit:   ( -- )
+ \ *G Initialise the class.
                  ClassInit: super
                  ['] noop to buttonfunc
***************
*** 328,332 ****
  
  :M WindowStyle: ( -- style )
! \ *G Get the window style of the control
                  WindowStyle: SUPER
                  [ BS_PUSHBUTTON WS_TABSTOP OR ] literal OR
--- 331,336 ----
  
  :M WindowStyle: ( -- style )
! \ *G Get the window style of the control. The default style is: BS_PUSHBUTTON,
! \ ** and WS_TABSTOP.
                  WindowStyle: SUPER
                  [ BS_PUSHBUTTON WS_TABSTOP OR ] literal OR
***************
*** 334,341 ****
  
  :M Start:       ( Parent -- )
! \ *G Create the control
!                 to Parent
!                 z" BUTTON" Create-Control
!                 ;M
  
  :M WM_LBUTTONUP ( h m w l -- res )
--- 338,343 ----
  
  :M Start:       ( Parent -- )
! \ *G Create the control.
!                 to Parent z" BUTTON" Create-Control ;M
  
  :M WM_LBUTTONUP ( h m w l -- res )
***************
*** 358,362 ****
  \ *G Base class for windows that contain controls.
  
! :M ClassInit: ( -- )
          ClassInit: super
          +dialoglist
--- 360,365 ----
  \ *G Base class for windows that contain controls.
  
! :M ClassInit:   ( -- )
! \ *G Initialise the class.
          ClassInit: super
          +dialoglist