[htoolkit-cvs] port/src/cbits/GTK TrackBar.c,1.1,1.2

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

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

Modified Files:
	TrackBar.c 
Log Message:
bugfix


Index: TrackBar.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/GTK/TrackBar.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TrackBar.c	23 Nov 2003 10:23:13 -0000	1.1
--- TrackBar.c	24 Nov 2003 19:22:08 -0000	1.2
***************
*** 3,27 ****
  #include "Handlers_stub.h"
  
! WindowHandle osCreateHorzTrackBar(WindowHandle form)
  {
  	GtkWidget *trackBar;
  	GtkWidget *left_button, *right_button;
! 	
  	left_button = gtk_button_new();
  	gtk_signal_connect (GTK_OBJECT(left_button), "clicked",
! 			GTK_SIGNAL_FUNC(handleTrackBarIncrement),
! 			NULL);
  	gtk_container_add(GTK_CONTAINER(left_button),  gtk_arrow_new(GTK_ARROW_LEFT,GTK_SHADOW_NONE));
  	gtk_widget_show_all(left_button);
  
  	right_button = gtk_button_new();
  	gtk_signal_connect (GTK_OBJECT(right_button), "clicked",
! 			GTK_SIGNAL_FUNC(handleTrackBarDecrement),
! 			NULL);
  	gtk_container_add(GTK_CONTAINER(right_button), gtk_arrow_new(GTK_ARROW_RIGHT,GTK_SHADOW_NONE));
  	gtk_widget_show_all(right_button);
- 	
- 	trackBar = gtk_hbox_new(TRUE, 0);
- 	gtk_box_pack_start(GTK_BOX(trackBar),left_button ,TRUE,TRUE,0);
  	gtk_box_pack_end  (GTK_BOX(trackBar),right_button,TRUE,TRUE,0);
  
--- 3,40 ----
  #include "Handlers_stub.h"
  
! static void track_increment(GtkWidget *widget, gpointer data)
! {
! 	handleTrackBarIncrement((WindowHandle) data);
! }
! 
! static void track_decrement(GtkWidget *widget, gpointer data)
! {
! 	handleTrackBarDecrement((WindowHandle) data);
! }
! 
! WindowHandle osCreateHorzTrackBar(WindowHandle window)
  {
  	GtkWidget *trackBar;
  	GtkWidget *left_button, *right_button;
! 
! 	trackBar = gtk_hbox_new(TRUE, 0);
! 	port_layout_put(PORT_LAYOUT(GTK_BIN(window)->child), trackBar);
! 
  	left_button = gtk_button_new();
+ 	gtk_container_set_border_width(GTK_CONTAINER(left_button), 0);
  	gtk_signal_connect (GTK_OBJECT(left_button), "clicked",
! 			GTK_SIGNAL_FUNC(track_decrement),
! 			trackBar);
  	gtk_container_add(GTK_CONTAINER(left_button),  gtk_arrow_new(GTK_ARROW_LEFT,GTK_SHADOW_NONE));
  	gtk_widget_show_all(left_button);
+ 	gtk_box_pack_start(GTK_BOX(trackBar),left_button ,TRUE,TRUE,0);
  
  	right_button = gtk_button_new();
+ 	gtk_container_set_border_width(GTK_CONTAINER(right_button), 0);
  	gtk_signal_connect (GTK_OBJECT(right_button), "clicked",
! 			GTK_SIGNAL_FUNC(track_increment),
! 			trackBar);
  	gtk_container_add(GTK_CONTAINER(right_button), gtk_arrow_new(GTK_ARROW_RIGHT,GTK_SHADOW_NONE));
  	gtk_widget_show_all(right_button);
  	gtk_box_pack_end  (GTK_BOX(trackBar),right_button,TRUE,TRUE,0);
  
***************
*** 29,55 ****
  };
  
! WindowHandle osCreateVertTrackBar(WindowHandle form)
  {
  	GtkWidget *trackBar;
  	GtkWidget *up_button, *down_button;
  
  	up_button = gtk_button_new();
  	gtk_signal_connect (GTK_OBJECT(up_button), "clicked",
! 			GTK_SIGNAL_FUNC(handleTrackBarIncrement),
! 			NULL);
  	gtk_container_add(GTK_CONTAINER(up_button),  gtk_arrow_new(GTK_ARROW_UP,GTK_SHADOW_NONE));
  	gtk_widget_show_all(up_button);
  
  	down_button = gtk_button_new();
  	gtk_signal_connect (GTK_OBJECT(down_button), "clicked",
! 			GTK_SIGNAL_FUNC(handleTrackBarDecrement),
! 			NULL);
  	gtk_container_add(GTK_CONTAINER(down_button), gtk_arrow_new(GTK_ARROW_DOWN,GTK_SHADOW_NONE));
  	gtk_widget_show_all(down_button);
- 
- 	trackBar = gtk_vbox_new(TRUE, 0);
- 	gtk_box_pack_start(GTK_BOX(trackBar),up_button,  TRUE,TRUE,0);
  	gtk_box_pack_end  (GTK_BOX(trackBar),down_button,TRUE,TRUE,0);
! 	
  	return trackBar;
  };
--- 42,69 ----
  };
  
! WindowHandle osCreateVertTrackBar(WindowHandle window)
  {
  	GtkWidget *trackBar;
  	GtkWidget *up_button, *down_button;
  
+ 	trackBar = gtk_vbox_new(TRUE, 0);
+ 	port_layout_put(PORT_LAYOUT(GTK_BIN(window)->child), trackBar);
+ 
  	up_button = gtk_button_new();
  	gtk_signal_connect (GTK_OBJECT(up_button), "clicked",
! 			GTK_SIGNAL_FUNC(track_increment),
! 			trackBar);
  	gtk_container_add(GTK_CONTAINER(up_button),  gtk_arrow_new(GTK_ARROW_UP,GTK_SHADOW_NONE));
  	gtk_widget_show_all(up_button);
+ 	gtk_box_pack_start(GTK_BOX(trackBar),up_button,  TRUE,TRUE,0);
  
  	down_button = gtk_button_new();
  	gtk_signal_connect (GTK_OBJECT(down_button), "clicked",
! 			GTK_SIGNAL_FUNC(track_decrement),
! 			trackBar);
  	gtk_container_add(GTK_CONTAINER(down_button), gtk_arrow_new(GTK_ARROW_DOWN,GTK_SHADOW_NONE));
  	gtk_widget_show_all(down_button);
  	gtk_box_pack_end  (GTK_BOX(trackBar),down_button,TRUE,TRUE,0);
! 
  	return trackBar;
  };
***************
*** 59,63 ****
  	GtkRequisition requisition;
  
! 	gtk_widget_size_request(button, &requisition);
  
  	res[0] = requisition.width;
--- 73,77 ----
  	GtkRequisition requisition;
  
! 	gtk_widget_size_request(trackBar, &requisition);
  
  	res[0] = requisition.width;