[htoolkit-cvs] port/src/cbits/GTK ToolBar.c,1.3,1.4

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

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

Modified Files:
	ToolBar.c 
Log Message:
Uncomment the implementation of the ToolBar


Index: ToolBar.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/GTK/ToolBar.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ToolBar.c	10 Aug 2003 18:36:04 -0000	1.3
--- ToolBar.c	16 Aug 2003 07:59:42 -0000	1.4
***************
*** 46,50 ****
  ToolHandle osInsertToolButton(WindowHandle toolbar, int pos)
  {
- /*
  	GtkToolItem *item = gtk_tool_button_new("", gtk_image_new());
  	gtk_signal_connect (GTK_OBJECT(GTK_TOOL_BUTTON(item)->button), "clicked",
--- 46,49 ----
***************
*** 58,69 ****
  	gtk_widget_show_all(GTK_WIDGET(item));
  	return GTK_WIDGET(item);
- */
- 	printf("osInsertToolButton -> not implemented");
- 	return NULL;
  }
  
  ToolHandle osInsertToolCheckButton(WindowHandle toolbar, int pos)
  {
- /*
  	GtkToolItem *item = gtk_toggle_tool_button_new();
  	gtk_signal_connect (GTK_OBJECT(GTK_TOOL_BUTTON(item)->button), "clicked",
--- 57,64 ----
***************
*** 79,90 ****
  	gtk_widget_show_all(GTK_WIDGET(item));
  	return GTK_WIDGET(item);
- */
- 	printf("osInsertToolCheckButton -> not implemented");
- 	return NULL;
  }
  
  ToolHandle osInsertToolLine(WindowHandle toolbar, int pos)
  {
- /*
  	GtkToolItem *item = gtk_separator_tool_item_new();
  	gtk_signal_connect (GTK_OBJECT(item), "destroy",
--- 74,81 ----
***************
*** 94,105 ****
  	gtk_widget_show_all(GTK_WIDGET(item));
  	return GTK_WIDGET(item);
- */
- 	printf("osInsertToolLine -> not implemented");
- 	return NULL;
  }
  
  void osSetToolButtonBitmap(ToolHandle toolButton, BitmapHandle bitmap)
  {
! 	//gtk_image_set_from_pixbuf(gtk_tool_button_get_icon_widget (GTK_TOOL_BUTTON(toolButton)), bitmap->pixbuf);
  }
  
--- 85,93 ----
  	gtk_widget_show_all(GTK_WIDGET(item));
  	return GTK_WIDGET(item);
  }
  
  void osSetToolButtonBitmap(ToolHandle toolButton, BitmapHandle bitmap)
  {
! 	gtk_image_set_from_pixbuf(gtk_tool_button_get_icon_widget (GTK_TOOL_BUTTON(toolButton)), bitmap->pixbuf);
  }
  
***************
*** 116,153 ****
  void osSetToolButtonTip(ToolHandle toolButton, char *text)
  {
! 	//GtkWidget *toolbar = gtk_widget_get_parent(toolButton);
! 	//gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(toolButton), GTK_TOOLBAR(toolbar)->tooltips, text, NULL);
  }
  
  char *osGetToolButtonTip(ToolHandle toolButton)
  {
! 	//GtkTooltipsData *tips_data = gtk_tooltips_data_get(GTK_BIN (toolButton)->child);
! 	//return strdup(tips_data->tip_text);
! 	return strdup("");
  }
  
  void osSetToolButtonText(ToolHandle toolButton, char *text)
  {
!   	//GtkWidget *label = gtk_tool_button_get_label_widget (GTK_TOOL_BUTTON(toolButton));
! 	//gtk_label_set_text(GTK_LABEL(label), text);
  }
  
  char *osGetToolButtonText(ToolHandle toolButton)
  {
! 	/*GtkWidget *label = gtk_tool_button_get_label_widget (GTK_TOOL_BUTTON(toolButton));
  	char *text = gtk_label_get_text(GTK_LABEL(label));
! 	return strdup(text);*/
! 	return strdup("");
  }
  
  void osSetToolButtonChecked(ToolHandle toolButton, BOOL bState)
  {
! 	//gtk_toggle_tool_button_set_active  (GTK_TOGGLE_TOOL_BUTTON(toolButton), bState);
  };
  
  BOOL osGetToolButtonChecked(ToolHandle toolButton)
  {
! 	//return gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(toolButton));
! 	return FALSE;
  };
  
--- 104,138 ----
  void osSetToolButtonTip(ToolHandle toolButton, char *text)
  {
! 	GtkWidget *toolbar = gtk_widget_get_parent(toolButton);
! 	gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(toolButton), GTK_TOOLBAR(toolbar)->tooltips, text, NULL);
  }
  
  char *osGetToolButtonTip(ToolHandle toolButton)
  {
! 	GtkTooltipsData *tips_data = gtk_tooltips_data_get(GTK_BIN (toolButton)->child);
! 	return strdup(tips_data->tip_text);
  }
  
  void osSetToolButtonText(ToolHandle toolButton, char *text)
  {
!   	GtkWidget *label = gtk_tool_button_get_label_widget (GTK_TOOL_BUTTON(toolButton));
! 	gtk_label_set_text(GTK_LABEL(label), text);
  }
  
  char *osGetToolButtonText(ToolHandle toolButton)
  {
! 	GtkWidget *label = gtk_tool_button_get_label_widget (GTK_TOOL_BUTTON(toolButton));
  	char *text = gtk_label_get_text(GTK_LABEL(label));
! 	return strdup(text);
  }
  
  void osSetToolButtonChecked(ToolHandle toolButton, BOOL bState)
  {
! 	gtk_toggle_tool_button_set_active  (GTK_TOGGLE_TOOL_BUTTON(toolButton), bState);
  };
  
  BOOL osGetToolButtonChecked(ToolHandle toolButton)
  {
! 	return gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(toolButton));
  };
  
***************
*** 159,164 ****
  int osGetToolItemPos(ToolHandle toolItem)
  {
! 	//GtkWidget *toolbar = gtk_widget_get_parent(toolItem);
! 	//return gtk_toolbar_get_item_index(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(toolItem));
! 	return 0;
  }
--- 144,148 ----
  int osGetToolItemPos(ToolHandle toolItem)
  {
! 	GtkWidget *toolbar = gtk_widget_get_parent(toolItem);
! 	return gtk_toolbar_get_item_index(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(toolItem));
  }