[Win32forth-cvs] win32forth/src/lib RebarControl.f,1.3,1.4

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

Update of /cvsroot/win32forth/win32forth/src/lib
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17440/src/lib

Modified Files:
	RebarControl.f 
Log Message:
Rod: Load Common Controls in Start: method, added On_Done: method

Index: RebarControl.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/lib/RebarControl.f,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** RebarControl.f	4 Jun 2006 21:13:02 -0000	1.3
--- RebarControl.f	5 Jun 2006 16:53:52 -0000	1.4
***************
*** 43,48 ****
  :M ClassInit: ( -- )
          ClassInit: super
-         \ Make sure Common Controls are loaded
-         ICC_COOL_CLASSES 8 sp@ Call InitCommonControlsEx 3drop
          Eraseband-info ;M
  
--- 43,46 ----
***************
*** 68,72 ****
  ;Record
  
! :M HitTest: ( -- iBand )
          hWnd get-mouse-XY to y to x
          RBHITTESTINFO 0  RB_HITTEST  SendMessage:Self ;M
--- 66,70 ----
  ;Record
  
! :M HitTest: ( -- uBand )
          hWnd get-mouse-XY to y to x
          RBHITTESTINFO 0  RB_HITTEST  SendMessage:Self ;M
***************
*** 78,87 ****
  :M InsertBand: ( -- )   -1 InsertBandAt: self ;M   \ band info should have been set
          
! :M MaximizeBand: ( fIdeal iBand -- )   RB_MAXIMIZEBAND SendMessage:SelfDrop ;M
  
! :M MinimizeBand: ( iBand -- )   0 swap RB_MINIMIZEBAND SendMessage:SelfDrop ;M
  
  :M SetBarInfo: ( himl fmask -- )   12 sp@ 0 RB_SETBARINFO SendMessage:SelfDrop 3drop ;M
  
  :M Start: ( Parent -- )
          hWnd
--- 76,87 ----
  :M InsertBand: ( -- )   -1 InsertBandAt: self ;M   \ band info should have been set
          
! :M MaximizeBand: ( fIdeal uBand -- )   RB_MAXIMIZEBAND SendMessage:SelfDrop ;M
  
! :M MinimizeBand: ( uBand -- )   0 swap RB_MINIMIZEBAND SendMessage:SelfDrop ;M
  
  :M SetBarInfo: ( himl fmask -- )   12 sp@ 0 RB_SETBARINFO SendMessage:SelfDrop 3drop ;M
  
+ :M ShowBand: ( f uBand -- )   RB_SHOWBAND SendMessage:SelfDrop ;M
+ 
  :M Start: ( Parent -- )
          hWnd
***************
*** 90,96 ****
--- 90,107 ----
          else
              to Parent
+             \ Make sure Common Controls are loaded
+             ICC_COOL_CLASSES 8 sp@ Call InitCommonControlsEx 3drop
              z" ReBarWindow32" Create-Control 
              0 0 SetBarInfo: self
          then ;M
+ 
+ :M On_Done: ( -- )   ;M
+ 
+ :M WM_DESTROY ( h m w l -- res )
+         On_Done: [ self ]
+         old-wndproc CallWindowProc
+         0 to hWnd ;M
+ 
+ 
  ((
  \ Not yet used/tested
***************
*** 113,117 ****
  :M SetTextColor: ( clrText -- )   0 RB_SETTEXTCOLOR SendMessage:SelfDrop ;M
  :M SetToolTips: ( hwndToolTip -- )   0 swap RB_SETTOOLTIPS SendMessage:SelfDrop ;M
- :M ShowBand: ( f i -- )   RB_SHOWBAND SendMessage:SelfDrop ;M
  :M SizeToRect: ( rect -- )   0 RB_SIZETORECT SendMessage:SelfDrop ;M
  ))
--- 124,127 ----