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

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

Update of /cvsroot/htoolkit/port/src/cbits/GTK
In directory sc8-pr-cvs1:/tmp/cvs-serv14234/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.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** Window.c	2 Oct 2003 22:31:39 -0000	1.30
--- Window.c	6 Oct 2003 17:36:31 -0000	1.31
***************
*** 11,20 ****
  static void getWindowClipRect(GtkWidget *window, GdkRegion *region)
  {
! 	GList *childrens = gtk_container_get_children(GTK_CONTAINER(GTK_BIN(window)->child));
  
! 	while (childrens)
  	{
  		GdkRectangle rectangle;
! 		GtkWidget *widget = (GtkWidget *) childrens->data;
  
  		rectangle.x = widget->allocation.x;
--- 11,20 ----
  static void getWindowClipRect(GtkWidget *window, GdkRegion *region)
  {
! 	GList *children = gtk_container_get_children(GTK_CONTAINER(GTK_BIN(window)->child));
  
! 	while (children)
  	{
  		GdkRectangle rectangle;
! 		GtkWidget *widget = (GtkWidget *) children->data;
  
  		rectangle.x = widget->allocation.x;
***************
*** 24,28 ****
  		gdk_region_subtract(region, gdk_region_rectangle (&rectangle));
  
! 		childrens = childrens->next;
  	}
  }
--- 24,28 ----
  		gdk_region_subtract(region, gdk_region_rectangle (&rectangle));
  
! 		children = g_list_remove(children, widget);
  	}
  }
***************
*** 685,691 ****
  
  	GtkRequisition child_requisition, hscrollbar_requisition, vscrollbar_requisition;
! 	GtkWidget *viewport;
  
! 	viewport = GTK_BIN(window)->child;
  
  	rectangle.x = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW(window))->value;
--- 685,691 ----
  
  	GtkRequisition child_requisition, hscrollbar_requisition, vscrollbar_requisition;
! 	GtkWidget *layout;
  
! 	layout = GTK_BIN(window)->child;
  
  	rectangle.x = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW(window))->value;
***************
*** 694,699 ****
  	rectangle.height = window->allocation.height;
  
! 	gtk_widget_size_request(viewport, &child_requisition);
! 
  
  	gtk_widget_size_request(GTK_SCROLLED_WINDOW(window)->hscrollbar, &hscrollbar_requisition);
--- 694,698 ----
  	rectangle.height = window->allocation.height;
  
! 	gtk_widget_size_request(layout, &child_requisition);
  
  	gtk_widget_size_request(GTK_SCROLLED_WINDOW(window)->hscrollbar, &hscrollbar_requisition);
***************
*** 711,715 ****
  	canvas = rmalloc(sizeof(*canvas));
  	memset(canvas, 0, sizeof(*canvas));
! 	canvas->drawable = GDK_DRAWABLE(GTK_BIN(viewport)->child->window);
  	canvas->region = gdk_region_rectangle(&rectangle);
  	canvas->buffered = 0;
--- 710,714 ----
  	canvas = rmalloc(sizeof(*canvas));
  	memset(canvas, 0, sizeof(*canvas));
! 	canvas->drawable = GDK_DRAWABLE(PORT_LAYOUT(layout)->bin_window);
  	canvas->region = gdk_region_rectangle(&rectangle);
  	canvas->buffered = 0;