Update of /cvsroot/win32forth/win32forth/src/console
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27307
Modified Files:
CommandWindow.f
Log Message:
Rod: undone last change to CommandFont - was causing crashes
Index: CommandWindow.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/console/CommandWindow.f,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** CommandWindow.f 26 Aug 2008 17:20:50 -0000 1.17
--- CommandWindow.f 29 Aug 2008 08:55:18 -0000 1.18
***************
*** 11,14 ****
--- 11,21 ----
\ Cut, copy and paste
+
+ Font CommandFont
+ 10 Height: CommandFont
+ \ FW_HEAVY Weight: CommandFont \ Optional
+ s" Courier" SetFaceName: CommandFont
+ \ s" Terminal" SetFaceName: CommandFont \ Optional choice
+
defer HandleKeys ' drop is HandleKeys \ define to handle keys e.g. 'O' +k_control
defer HandleKeyDown ' drop is HandleKeyDown \ define to handle virtual keys e.g. VK_F12
***************
*** 25,33 ****
:M SetAction: ( xt -- ) to action ;M
! int CommandFont
int hFont
:M SetFont: ( font -- )
! delete: CommandFont to CommandFont create: CommandFont
! Handle: CommandFont to hFont paint: self
PauseForMessages BigCursor: [ self ]
;M
--- 32,40 ----
:M SetAction: ( xt -- ) to action ;M
! int font
int hFont
:M SetFont: ( font -- )
! delete: font to font create: font
! Handle: font to hFont paint: self
PauseForMessages BigCursor: [ self ]
;M
***************
*** 1204,1207 ****
--- 1211,1217 ----
8 to HorzLine
13 to VertLine
+ CommandFont to font
+ Create: CommandFont
+ Handle: CommandFont to hFont
Black to ForegroundColour
White to BackgroundColour
***************
*** 1227,1237 ****
:M On_Init: ( -- )
- new> font to CommandFont
- 10 Height: CommandFont
- \ FW_HEAVY Weight: CommandFont \ Optional
- s" Courier" SetFaceName: CommandFont
- \ s" Terminal" SetFaceName: CommandFont \ Optional choice
- Create: CommandFont
- Handle: CommandFont to hFont
MaxText malloc to text text MaxText 45 fill 0 text c! \ text MaxText erase
CommandFont SetFont: self \ this creates a caret in BigCursor: self
--- 1237,1240 ----
|