htoolkit-cvs

[<kr_...@us...>]

Update of /cvsroot/htoolkit/port/src/cbits/Win32
In directory sc8-pr-cvs1:/tmp/cvs-serv22219/src/cbits/Win32

Modified Files:
	Internals.h ToolBar.c 
Log Message:
Fix ToolBar for Win32


Index: Internals.h
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/Win32/Internals.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Internals.h	1 May 2003 20:38:26 -0000	1.2
--- Internals.h	8 Jul 2003 21:18:06 -0000	1.3
***************
*** 30,33 ****
--- 30,35 ----
  	LPSTR lpszAppVersion;
  	MenuHandlesMap *pMenuHandlesMap;
+ 	
+ 	HWND hLeftBar, hTopBar, hRightBar, hBottomBar;
  } FrameData;
  

Index: ToolBar.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/Win32/ToolBar.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ToolBar.c	8 Jul 2003 20:31:29 -0000	1.1
--- ToolBar.c	8 Jul 2003 21:18:06 -0000	1.2
***************
*** 3,7 ****
  #include "Internals.h"
  
! typedef struct _ToolHandle
  {
  	int nCommand;
--- 3,7 ----
  #include "Internals.h"
  
! struct ToolHandle
  {
  	int nCommand;
***************
*** 11,20 ****
  static int nNextToolButtonID = 0;
  
! WindowHandle osCreateToolBar(int nPlace)
  {
  	HWND hControlBar, hWnd;
  	FrameData *pFrameData = (FrameData *) GetWindowLong(ghWndFrame,GWL_USERDATA);
  	
! 	switch (nPlace)
  	{
  	case 0: hControlBar = pFrameData->hLeftBar;   break;
--- 11,20 ----
  static int nNextToolButtonID = 0;
  
! WindowHandle osCreateToolBar(char *name, int place, int band_num, int band_position, int offset)
  {
  	HWND hControlBar, hWnd;
  	FrameData *pFrameData = (FrameData *) GetWindowLong(ghWndFrame,GWL_USERDATA);
  	
! 	switch (place)
  	{
  	case 0: hControlBar = pFrameData->hLeftBar;   break;
***************
*** 44,48 ****
  	ToolHandle btn;
  
! 	btn = malloc(sizeof(struct _ToolHandle));
  	if (!btn) return NULL;
  
--- 44,48 ----
  	ToolHandle btn;
  
! 	btn = malloc(sizeof(struct ToolHandle));
  	if (!btn) return NULL;
  
***************
*** 78,82 ****
  	ToolHandle btn;
  
! 	btn = malloc(sizeof(struct _ToolHandle));
  	if (!btn) return NULL;
  
--- 78,82 ----
  	ToolHandle btn;
  
! 	btn = malloc(sizeof(struct ToolHandle));
  	if (!btn) return NULL;