htoolkit-cvs

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

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

Modified Files:
	Window.c 
Log Message:
osScrollWindowTo function is renamed to osSetWindowScrollOrigin.
Added osGetWindowScrollOrigin function


Index: Window.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/GTK/Window.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** Window.c	5 Jul 2003 11:01:16 -0000	1.20
--- Window.c	13 Jul 2003 10:21:27 -0000	1.21
***************
*** 592,604 ****
  void osSetWindowDomainSize(WindowHandle window, int cx, int cy)
  {
  	gtk_window_set_resizable(GTK_WINDOW(gFrameWidget), FALSE);
  	gtk_widget_set_size_request(GTK_BIN(GTK_BIN(window)->child)->child,cx,cy);
  	gtk_window_set_resizable(GTK_WINDOW(gFrameWidget), TRUE);
  }
  
! void osScrollWindowTo(WindowHandle window, int x, int y)
  {
  	gtk_adjustment_set_value(gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW(window)), x);
  	gtk_adjustment_set_value(gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW(window)), y);
  }
  
--- 592,620 ----
  void osSetWindowDomainSize(WindowHandle window, int cx, int cy)
  {
+ 	GtkAdjustment *adjustment;
+ 
  	gtk_window_set_resizable(GTK_WINDOW(gFrameWidget), FALSE);
  	gtk_widget_set_size_request(GTK_BIN(GTK_BIN(window)->child)->child,cx,cy);
  	gtk_window_set_resizable(GTK_WINDOW(gFrameWidget), TRUE);
+ 
+ 	adjustment = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW(window));
+ 	adjustment->upper = cx;
+ 	gtk_adjustment_changed(adjustment);
+ 
+ 	adjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW(window));
+ 	adjustment->upper = cy;
+ 	gtk_adjustment_changed(adjustment);
  }
  
! void osSetWindowScrollOrigin(WindowHandle window, int x, int y)
  {
  	gtk_adjustment_set_value(gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW(window)), x);
  	gtk_adjustment_set_value(gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW(window)), y);
+ }
+ 
+ void osGetWindowScrollOrigin(WindowHandle window, int *res)
+ {
+ 	res[0] = gtk_adjustment_get_value(gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW(window)));
+ 	res[1] = gtk_adjustment_get_value(gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW(window)));
  }