[htoolkit-cvs] port/src/cbits/GTK Window.c,1.31,1.32

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

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

Modified Files:
	Window.c 
Log Message:
bugfix


Index: Window.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/GTK/Window.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** Window.c	6 Oct 2003 17:36:31 -0000	1.31
--- Window.c	7 Oct 2003 17:31:49 -0000	1.32
***************
*** 73,88 ****
  {
  	GtkWidget *window = (GtkWidget *) user_data;
- 	GtkScrolledWindow *sw = GTK_SCROLLED_WINDOW(window);
  
- 	int x, y;
  	int modifiers = 0;
- 
  	if (event->state & GDK_SHIFT_MASK) modifiers |= shiftBIT;
  	if (event->state & GDK_CONTROL_MASK) modifiers |= ctrlBIT;
  	if (event->state & GDK_MOD1_MASK) modifiers |= altBIT;
  
- 	x = gtk_scrolled_window_get_hadjustment (sw)->value + event->x;
- 	y = gtk_scrolled_window_get_vadjustment (sw)->value + event->y;
- 
  	switch (event->type)
  	{
--- 73,82 ----
***************
*** 92,100 ****
  				case 1:
  					bInDragMode = TRUE;
! 					handleWindowMouse(window,evMouseLeftDown,x,y,modifiers);
  					break;
  				case 3:
! 					handleWindowMouse(window,evMouseRightDown,x,y,modifiers);
! 					handleWindowContextMenu(window,x,y,modifiers);
  					break;
  			}
--- 86,94 ----
  				case 1:
  					bInDragMode = TRUE;
! 					handleWindowMouse(window,evMouseLeftDown,event->x,event->y,modifiers);
  					break;
  				case 3:
! 					handleWindowMouse(window,evMouseRightDown,event->x,event->y,modifiers);
! 					handleWindowContextMenu(window,event->x,event->y,modifiers);
  					break;
  			}
***************
*** 102,106 ****
  		case GDK_2BUTTON_PRESS:
  			if (event->button == 1)
! 				handleWindowMouse(window,evMouseDoubleClick,x,y,modifiers);
  			break;
  		default:
--- 96,100 ----
  		case GDK_2BUTTON_PRESS:
  			if (event->button == 1)
! 				handleWindowMouse(window,evMouseDoubleClick,event->x,event->y,modifiers);
  			break;
  		default:
***************
*** 114,137 ****
  {
  	GtkWidget *window = (GtkWidget *) user_data;
- 	GtkScrolledWindow *sw = GTK_SCROLLED_WINDOW(window);
  
- 	int x, y;
  	int modifiers = 0;
- 
  	if (event->state & GDK_SHIFT_MASK) modifiers |= shiftBIT;
  	if (event->state & GDK_CONTROL_MASK) modifiers |= ctrlBIT;
  	if (event->state & GDK_MOD1_MASK) modifiers |= altBIT;
  
- 	x = gtk_scrolled_window_get_hadjustment (sw)->value + event->x;
- 	y = gtk_scrolled_window_get_vadjustment (sw)->value + event->y;
- 
  	switch (event->button)
  	{
  		case 1:
  			bInDragMode = FALSE;
! 			handleWindowMouse(window,evMouseLeftUp,x,y,modifiers);
  			break;
  		case 3:
! 			handleWindowMouse(window,evMouseRightUp,x,y,modifiers);
  			break;
  	}
--- 108,125 ----
  {
  	GtkWidget *window = (GtkWidget *) user_data;
  
  	int modifiers = 0;
  	if (event->state & GDK_SHIFT_MASK) modifiers |= shiftBIT;
  	if (event->state & GDK_CONTROL_MASK) modifiers |= ctrlBIT;
  	if (event->state & GDK_MOD1_MASK) modifiers |= altBIT;
  
  	switch (event->button)
  	{
  		case 1:
  			bInDragMode = FALSE;
! 			handleWindowMouse(window,evMouseLeftUp,event->x,event->y,modifiers);
  			break;
  		case 3:
! 			handleWindowMouse(window,evMouseRightUp,event->x,event->y,modifiers);
  			break;
  	}
***************
*** 143,164 ****
  {
  	GtkWidget *window = (GtkWidget *) user_data;
- 	GtkScrolledWindow *sw = GTK_SCROLLED_WINDOW(window);
  
- 	int x, y;
  	int modifiers = 0;
- 
- 
- 
  	if (event->state & GDK_SHIFT_MASK) modifiers |= shiftBIT;
  	if (event->state & GDK_CONTROL_MASK) modifiers |= ctrlBIT;
  	if (event->state & GDK_MOD1_MASK) modifiers |= altBIT;
  
- 	x = gtk_scrolled_window_get_hadjustment (sw)->value + event->x;
- 	y = gtk_scrolled_window_get_vadjustment (sw)->value + event->y;
- 
  	if (bInDragMode)
! 		handleWindowMouse(window,evMouseDrag,x,y,modifiers);
  	else
! 		handleWindowMouse(window,evMouseMove,x,y,modifiers);
  
  	return gtk_true();
--- 131,144 ----
  {
  	GtkWidget *window = (GtkWidget *) user_data;
  
  	int modifiers = 0;
  	if (event->state & GDK_SHIFT_MASK) modifiers |= shiftBIT;
  	if (event->state & GDK_CONTROL_MASK) modifiers |= ctrlBIT;
  	if (event->state & GDK_MOD1_MASK) modifiers |= altBIT;
  
  	if (bInDragMode)
! 		handleWindowMouse(window,evMouseDrag,event->x,event->y,modifiers);
  	else
! 		handleWindowMouse(window,evMouseMove,event->x,event->y,modifiers);
  
  	return gtk_true();