[Win32forth-cvs] win32forth/src/lib toolbar.f,1.2,1.3

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

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

Modified Files:
	toolbar.f 
Log Message:
Rod: changed Win32ToolBar Class to use Control instead of Child-Window

Index: toolbar.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/lib/toolbar.f,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** toolbar.f	10 Jun 2005 16:44:23 -0000	1.2
--- toolbar.f	25 Sep 2005 18:31:51 -0000	1.3
***************
*** 21,24 ****
--- 21,27 ----
  
          Change log:
+                 September 25th, 2005 - 18:59 - Rod
+                 Changed to use Control rather than Child-Window
+ 
                  September 22nd, 2003 - 16:11 - EAB
                  Corrected bug in On_GetButtonInfo: that was causing incorrect tooltips
***************
*** 295,299 ****
  \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
  
! :Class  Win32ToolBar    <super  Child-Window
  
          int ButtonTable
--- 298,302 ----
  \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
  
! :Class  Win32ToolBar    <super  Control
  
          int ButtonTable
***************
*** 328,355 ****
      Rectangle   ButtonRect
  
- 
- \ -------------------- Create Tool-bar Child Window --------------------
- 
- create toolbar-class   z," ToolbarWindow32"     \ Pre-registered class
- 
- : create-toolbar ( -- hWnd )
-                 \ Make sure Common Controls are loaded
-                 ICC_BAR_CLASSES 8 sp@ Call InitCommonControlsEx 3drop
-                 NULL                            \ Creation parameter
-                 appInst                         \ Instance handle
-                 id                              \ Child id
-                 Parent conhndl =
-                 if   conhndl
-                 else GetHandle: Parent          \ parent window handle
-                 then
-                 0 0                             \ Size h,w
-                 0 0                             \ Position y,x
-                 WindowStyle: [ self ]           \ Style
-                 NULL                            \ Window name
-                 toolbar-class                   \ Pre-registered class
-                 0                               \ Extended style
-                 Call CreateWindowEx
-                 ;
- 
  : register-struct-size ( -- )
                  \ Register tbb structure size
--- 331,334 ----
***************
*** 369,373 ****
  
  :M On_Init:     ( -- )
!                 On_Init: super
                  ;M
  
--- 348,365 ----
  
  :M On_Init:     ( -- )
!                 ;M
! 
! :M WM_CREATE
!                 On_Init: [ self ]
!                 0
!                 ;M
! 
! :M On_Done:     ( -- )
!                 ;M
! 
! :M WM_DESTROY
!                 On_Done: [ self ]
!                 old-wndproc CallWindowProc
!                 0 to hWnd
                  ;M
  
***************
*** 383,387 ****
                  else
                          to Parent
!                         create-toolbar to hWnd
                          register-struct-size
  
--- 375,379 ----
                  else
                          to Parent
!                         z" ToolbarWindow32" Create-Control 
                          register-struct-size