[Win32forth-cvs] win32forth/apps/ForthForm CreatePropertyForm.f,1.1,1.2 FORMCONTROLS.F,1.4,1.5 FORMOBJECT.F,1.8,1.9 FORTHFORM.F,1.9,1.10 EXFONT.F,1.1,NONE

[Ezra B. <ezr...@us...>]

Update of /cvsroot/win32forth/win32forth/apps/ForthForm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2159/apps/ForthForm

Modified Files:
	CreatePropertyForm.f FORMCONTROLS.F FORMOBJECT.F FORTHFORM.F 
Removed Files:
	EXFONT.F 
Log Message:
Updated to use new gdiFont class.

Index: FORTHFORM.F
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/ForthForm/FORTHFORM.F,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** FORTHFORM.F	1 Nov 2005 23:14:04 -0000	1.9
--- FORTHFORM.F	4 Nov 2005 06:40:15 -0000	1.10
***************
*** 37,41 ****
  needs ScintillaControl.f    \ editor for FormPad
  needs FileLister.f          \ directory viewer
- needs exfont.f              \ enhanced font class to allow runtime font selection
  needs Win32Help.f
  needs Resources.f
--- 37,40 ----
***************
*** 715,719 ****
                  s" MS Sans Serif" SetFaceName: ControlFont
                  8 Width: ControlFont
!                 Create: ControlFont
  
                  self to TheMainWindow
--- 714,718 ----
                  s" MS Sans Serif" SetFaceName: ControlFont
                  8 Width: ControlFont
!                 Create: ControlFont drop
  
                  self to TheMainWindow

Index: CreatePropertyForm.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/ForthForm/CreatePropertyForm.f,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CreatePropertyForm.f	1 Nov 2005 23:14:04 -0000	1.1
--- CreatePropertyForm.f	4 Nov 2005 06:40:15 -0000	1.2
***************
*** 88,92 ****
                         s"  SetFaceName: WinFont"  append&crlf&tabs
                         s" 8 Width: WinFont" append&crlf&tabs
!                        s" Create: WinFont" append&crlf +crlf 2tabs
  
                         s" ['] ontab IsChangeFunc: SheetTab" append&crlf +crlf 2tabs
--- 88,92 ----
                         s"  SetFaceName: WinFont"  append&crlf&tabs
                         s" 8 Width: WinFont" append&crlf&tabs
!                        s" Create: WinFont drop " append&crlf +crlf 2tabs
  
                         s" ['] ontab IsChangeFunc: SheetTab" append&crlf +crlf 2tabs

Index: FORMCONTROLS.F
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/ForthForm/FORMCONTROLS.F,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FORMCONTROLS.F	1 Nov 2005 23:14:04 -0000	1.4
--- FORMCONTROLS.F	4 Nov 2005 06:40:15 -0000	1.5
***************
*** 628,633 ****
  ;RecordSize: SizeOf(ctrlData)
  
! UserFont TheFont
! \ BitmapObject ctrlBitmap \ doesn't appear to be and causes problems with bytes IVAR above gah
  
  int oldstyle
--- 628,632 ----
  ;RecordSize: SizeOf(ctrlData)
  
! Font TheFont
  
  int oldstyle
***************
*** 750,760 ****
  :M CreateFont:  ( -- )
                  Delete: TheFont
!                 Create: TheFont
                  Handle: TheFont SetFont: TheControl ;M
  
  :M GetUserFont: ( -- )
                  Delete: TheFont
!                 GetUserFont: TheFont drop
!                 LogFontStruct: TheFont ctrlFont swap move  \ save font info
                  true to fontchanged
                  CreateFont: self
--- 749,759 ----
  :M CreateFont:  ( -- )
                  Delete: TheFont
!                 Create: TheFont drop
                  Handle: TheFont SetFont: TheControl ;M
  
  :M GetUserFont: ( -- )
                  Delete: TheFont
!                 GetHandle: ActiveForm Choose: TheFont drop
!                 GetLogFont: TheFont ctrlFont sizeof(LogFont) move  \ save font info
                  true to fontchanged
                  CreateFont: self
***************
*** 764,768 ****
  : default-font  ( -- )
                  Delete: TheFont
!                 ControlFont.LogFont LogFontStruct: TheFont move
                  ControlFont.LogFont ctrlFont sizeof(LogFont) move ;
  
--- 763,767 ----
  : default-font  ( -- )
                  Delete: TheFont
!                 ControlFont.LogFont TheFont.LogFont sizeof(LogFont) move
                  ControlFont.LogFont ctrlFont sizeof(LogFont) move ;
  
***************
*** 779,783 ****
                  \ the following is done to correct any previously created forms which have the
                  \ font flag invalidly set and no font information
!                 TheFont.LogFont 7 cells+ ( lfFaceName ) zcount nip 0=
                  if    default-font
                        false to fontchanged
--- 778,782 ----
                  \ the following is done to correct any previously created forms which have the
                  \ font flag invalidly set and no font information
!                 GetFaceName: TheFont nip 0=
                  if    default-font
                        false to fontchanged

Index: FORMOBJECT.F
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/ForthForm/FORMOBJECT.F,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FORMOBJECT.F	1 Nov 2005 23:14:04 -0000	1.8
--- FORMOBJECT.F	4 Nov 2005 06:40:15 -0000	1.9
***************
*** 1426,1430 ****
                  FontChanged: ThisControl
                  if     s" Set-" append fontname append&crlf 2tabs
!                        s" Create: " append fontname append&crlf 2tabs
                         s" Handle: " append fontname append s"  SetFont: " append GetName: ThisControl append
                  else   s" Handle: Winfont SetFont: " append GetName: ThisControl append
--- 1426,1430 ----
                  FontChanged: ThisControl
                  if     s" Set-" append fontname append&crlf 2tabs
!                        s" Create: " append fontname append s"  drop" append&crlf 2tabs
                         s" Handle: " append fontname append s"  SetFont: " append GetName: ThisControl append
                  else   s" Handle: Winfont SetFont: " append GetName: ThisControl append
***************
*** 1889,1893 ****
                  s"  SetFaceName: WinFont" append&crlf
                  2tabs s" 8 Width: WinFont" append&crlf
! ( create font ) 2tabs s" Create: WinFont" append&crlf
          +crlf
          2tabs s" \ set form color to system color" append&crlf
--- 1889,1893 ----
                  s"  SetFaceName: WinFont" append&crlf
                  2tabs s" 8 Width: WinFont" append&crlf
! ( create font ) 2tabs s" Create: WinFont drop" append&crlf
          +crlf
          2tabs s" \ set form color to system color" append&crlf

--- EXFONT.F DELETED ---