win32forth-cvs

[Rod O. <rod...@us...>]

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

Modified Files:
	ProjectManager.f 
Log Message:
Rod: Project Manager v2.01.00.  Corrected bug in finding .res file.
Build project now finds AddCursor and AddIcon, .ico and .cur files added to resources section.
Cursor drawn in right pane for .cur file
Updated doc.

Index: ProjectManager.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/ProMgr/ProjectManager.f,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ProjectManager.f	21 Aug 2005 06:22:00 -0000	1.8
--- ProjectManager.f	5 Sep 2005 19:58:34 -0000	1.9
***************
*** 5,8 ****
--- 5,14 ----
  comment:
  
+ September 5th, 2005  Rod - version 2.01.00
+ 
+ Corrected bug in finding .res file
+ Build project now finds AddCursor and AddIcon, .ico and .cur files added to resources section
+ Cursor drawn in right pane for .cur file
+ 
  July 10th, 2005  Rod - additional features and tidying of code for version 2
  
***************
*** 90,94 ****
  \ Odd minor version numbers are possibly unstable beta releases.
  
! Create ProjectVersion ," 2.00.00"
  
  needs linklist.f
--- 96,100 ----
  \ Odd minor version numbers are possibly unstable beta releases.
  
! Create ProjectVersion ," 2.01.00"
  
  needs linklist.f
***************
*** 1005,1009 ****
              16 +loop    drop    Thebuffer Settextz: Viewbox ;
  
! int hFileIcon
  
  :M Show-file: ( -- )
--- 1011,1017 ----
              16 +loop    drop    Thebuffer Settextz: Viewbox ;
  
! : LoadCursor ( z$ -- h )   >r  LR_LOADFROMFILE 0 0 IMAGE_CURSOR r> 0 call LoadImage ;
! 
! int hImage
  
  :M Show-file: ( -- )
***************
*** 1015,1019 ****
              Case
                  s" .bmp"  "Of  GetBuffer: viewerfile drop SetBitmap: BitmapFile      Endof
!                 s" .ico"  "Of  Getname: SelectedItem LoadIcon to hFileIcon           Endof
                  s" .htm"  "Of  start-htmlbox  GetName: SelectedItem SetURL: HtmlBox  Endof
                  s" .html" "Of  start-htmlbox  GetName: SelectedItem SetURL: HtmlBox  Endof
--- 1023,1028 ----
              Case
                  s" .bmp"  "Of  GetBuffer: viewerfile drop SetBitmap: BitmapFile      Endof
!                 s" .ico"  "Of  Getname: SelectedItem LoadIcon to hImage           Endof
!                 s" .cur"  "Of  Getname: SelectedItem LoadCursor to hImage         Endof
                  s" .htm"  "Of  start-htmlbox  GetName: SelectedItem SetURL: HtmlBox  Endof
                  s" .html" "Of  start-htmlbox  GetName: SelectedItem SetURL: HtmlBox  Endof
***************
*** 1035,1057 ****
          GetHandle: HtmlBox if  Autosize: HtmlBox  then
          ;M
! ((
! : DrawIcon ( hIcon -- )   >r
!         DI_NORMAL
!     \    NULL
!         WHITE_BRUSH Call GetStockObject
!         NULL
!         0 0
!         r>
!         0 0
!         dc.hdc
!         Call DrawIconEx drop ;
! ))
  :M On_Paint: ( -- )   \ all painting to the dc should be done here so that only invalidated areas are updated
          FileExt
          Case
              s" .bmp"  "Of  0 0 dc.hdc ShowBitmap: BitmapFile  Endof
! \            s" .ico"  "Of  hFileIcon DrawIcon                 Endof
!             s" .ico"  "Of  DI_NORMAL  WHITE_BRUSH Call GetStockObject 
!                            0 0 0 hFileIcon 0 0 dc.hdc Call DrawIconEx  drop  Endof
          EndCase
          ;M
--- 1044,1056 ----
          GetHandle: HtmlBox if  Autosize: HtmlBox  then
          ;M
! 
! : DrawIcon ( hIcon -- )   0 0 dc.hdc call DrawIcon drop ;
! 
  :M On_Paint: ( -- )   \ all painting to the dc should be done here so that only invalidated areas are updated
          FileExt
          Case
              s" .bmp"  "Of  0 0 dc.hdc ShowBitmap: BitmapFile  Endof
!             s" .ico"  "Of  hImage DrawIcon                 Endof
!             s" .cur"  "Of  hImage DrawIcon                 Endof
          EndCase
          ;M
***************
*** 1503,1508 ****
  
  : AddFile ( a n -- )   \ add this file to needed list
!         2dup ".ext-only" pad place
!         pad dup count lower
          Case
              s" .f"      "of  addmodule:   TheProject  endof
--- 1502,1507 ----
  
  : AddFile ( a n -- )   \ add this file to needed list
!         2dup ".ext-only" FileExt place
!         FileExt dup count lower
          Case
              s" .f"      "of  addmodule:   TheProject  endof
***************
*** 1511,1514 ****
--- 1510,1514 ----
              s" .bmp"    "of  addresource: TheProject  endof
              s" .ico"    "of  addresource: TheProject  endof
+             s" .cur"    "of  addresource: TheProject  endof
              s" .res"    "of  addresource: TheProject  endof
              s" .h"      "of  addresource: TheProject  endof
***************
*** 1547,1554 ****
          THEN ;
  
! : needed-file? ( -- f )   \  if next word but one is needed-file or loadbitmapfile
          >in @             \  or 4th/5th word is AddAppIcon then add file to project
!         bl word drop
!         bl word count  2dup s" loadbitmapfile" caps-compare 0= -rot  s" needed-file" caps-compare 0=  or
          bl word drop  bl word count  s" AddAppIcon" caps-compare 0= or   \ 4th word
          bl word count  s" AddAppIcon" caps-compare 0= or   \ 5th word
--- 1547,1561 ----
          THEN ;
  
! : needed-file? ( -- f )   \  if 2nd word is needed-file or loadbitmapfile
          >in @             \  or 4th/5th word is AddAppIcon then add file to project
!         bl word drop      \  skip 1st word
!         bl word  dup count lower   \ 2nd word
!         Case
!             s" loadbitmapfile"  "of  true  endof
!             s" needed-file"     "of  true  endof
!             s" addcursor"       "of  true  endof
!             s" addicon"         "of  true  endof
!             ( default ) false swap
!         Endcase
          bl word drop  bl word count  s" AddAppIcon" caps-compare 0= or   \ 4th word
          bl word count  s" AddAppIcon" caps-compare 0= or   \ 5th word
***************
*** 1635,1650 ****
                          if  is-file?
                              if
!                                  dialog? IF
!                                              2dup pad place -2 pad c+! s" .res" pad +place
!                                              pad count ( ThisFile place ) addfile
!                                          THEN 
!                                  2dup ( ThisFile place ) addfile
!                               \   ThisFile +NULL
!                               \   ThisFile 1+ 0 SetText: ProjectStatusBar
!                                  2dup asciiz 0 SetText: ProjectStatusBar
!                                  skip-recurse?
!                                  if     2drop    
!                                  else   comment? -rot  recurse   to comment?   \ save comment? on stack
!                                  then       
                              then  
                          then ( false to skip-recurse? )
--- 1642,1656 ----
                          if  is-file?
                              if
!                                 2dup addfile
!                                 2dup asciiz 0 SetText: ProjectStatusBar
!                                 dialog? IF
!                                             2dup pad place -2 pad c+! s" .res" pad +place
!                                             pad count addfile
!                                             2dup asciiz 0 SetText: ProjectStatusBar
!                                         THEN 
!                                 skip-recurse?
!                                 if     2drop    
!                                 else   comment? -rot  recurse   to comment?   \ save comment? on stack
!                                 then       
                              then  
                          then ( false to skip-recurse? )
***************
*** 1995,2001 ****
  DOC
  s" doc\promgr\ProjectManager.htm" needed-file
! s" doc\promgr\prjFileMenu.gif" needed-file   ****  these are not found with spaces in filenames!
! s" doc\promgr\prjHelpMenu.gif" needed-file   ****  e.g. "prjFile Menu.gif"  
  s" doc\promgr\prjProjectMenu.gif" needed-file 
! s" doc\promgr\prjProjectWindow.gif" needed-file 
  ENDDOC
--- 2001,2008 ----
  DOC
  s" doc\promgr\ProjectManager.htm" needed-file
! s" doc\promgr\prjProjectWindow.gif" needed-file    ****  these are not found with spaces in filenames!
! s" doc\promgr\prjFileMenu.gif" needed-file         ****  e.g. "prjFile Menu.gif"
! s" doc\promgr\prjViewMenu.gif" needed-file 
  s" doc\promgr\prjProjectMenu.gif" needed-file 
! s" doc\promgr\prjHelpMenu.gif" needed-file 
  ENDDOC