[Win32forth-cvs] win32forth/apps/Win32ForthIDE Main.f,1.14,1.15

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

Update of /cvsroot/win32forth/win32forth/apps/Win32ForthIDE
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23571/apps/Win32ForthIDE

Modified Files:
	Main.f 
Log Message:
Rod: Tidied up the sizing of the rebar.

Index: Main.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/Main.f,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Main.f	14 Jun 2006 11:15:52 -0000	1.14
--- Main.f	15 Jun 2006 20:57:10 -0000	1.15
***************
*** 19,23 ****
  only forth also editor definitions \ put all words into the EDITOR vocabulary
  
!  true value sysgen
  
  s" apps\Win32ForthIDE" "fpath+
--- 19,23 ----
  only forth also editor definitions \ put all words into the EDITOR vocabulary
  
! true value sysgen
  
  s" apps\Win32ForthIDE" "fpath+
***************
*** 169,173 ****
  : ClientHeight            ( -- n )
          Height StatusBarHeight - ToolBarHeight - ;
! 
  : AdjustWindowSize      { width height win -- }
          [ SWP_SHOWWINDOW SWP_NOZORDER or SWP_NOMOVE or ] literal
--- 169,173 ----
  : ClientHeight            ( -- n )
          Height StatusBarHeight - ToolBarHeight - ;
! ((
  : AdjustWindowSize      { width height win -- }
          [ SWP_SHOWWINDOW SWP_NOZORDER or SWP_NOMOVE or ] literal
***************
*** 176,182 ****
          0       \ ignore z-order
          win Call SetWindowPos drop ;
! 
  :M ReSize:      ( -- )
!         ShowToolbar?   if Height: TheRebar           else 0 then to ToolBarHeight
          ShowStatusbar? if Height: ScintillaStatusbar else 0 then to StatusBarHeight
  
--- 176,182 ----
          0       \ ignore z-order
          win Call SetWindowPos drop ;
! ))
  :M ReSize:      ( -- )
!         ShowToolbar?   if Height: TheRebar  else 0 then to ToolBarHeight
          ShowStatusbar? if Height: ScintillaStatusbar else 0 then to StatusBarHeight
  
***************
*** 188,192 ****
          LeftWidth  ToolBarHeight  thickness  ClientHeight  Move: Splitter
  
!         ShowToolbar?   if  Width Height: TheRebar GetHandle: TheRebar AdjustWindowSize  then
          ShowStatusbar? if  Redraw: ScintillaStatusbar  then
          ;M
--- 188,193 ----
          LeftWidth  ToolBarHeight  thickness  ClientHeight  Move: Splitter
  
! \        ShowToolbar?   if  Width Height: TheRebar GetHandle: TheRebar AdjustWindowSize  then
!         ShowToolbar?  if  AutoSize: TheRebar  then
          ShowStatusbar? if  Redraw: ScintillaStatusbar  then
          ;M
***************
*** 481,485 ****
  
  :M WM_NOTIFY    { h m w l -- res }
!                 l 2 cells+ @ RBN_AUTOSIZE =   \ has TheRebar size changed?
                  if    Resize: self
                  then  h m w l Handle_Notify: pToolBar      \ must be first for some reason
--- 482,487 ----
  
  :M WM_NOTIFY    { h m w l -- res }
!                 l 2 cells+ @ RBN_HEIGHTCHANGE =   \ Rebar height has changed
!                                                   \ must NOT resize rebar on RBN_AUTOSIZE
                  if    Resize: self
                  then  h m w l Handle_Notify: pToolBar      \ must be first for some reason