From: <kr_...@us...> - 2003-07-23 16:25:25
|
Update of /cvsroot/htoolkit/port/src/cbits/GTK In directory sc8-pr-cvs1:/tmp/cvs-serv26695/port/src/cbits/GTK Modified Files: ToolBar.c Log Message: Add extra new line to the end of file. Index: ToolBar.c =================================================================== RCS file: /cvsroot/htoolkit/port/src/cbits/GTK/ToolBar.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ToolBar.c 8 Jul 2003 20:31:29 -0000 1.1 --- ToolBar.c 23 Jul 2003 16:25:20 -0000 1.2 *************** *** 15,21 **** switch (place) { ! case 0: placement = BONOBO_DOCK_LEFT; break; ! case 1: placement = BONOBO_DOCK_TOP; break; ! case 2: placement = BONOBO_DOCK_RIGHT; break; case 3: placement = BONOBO_DOCK_BOTTOM; break; default: --- 15,21 ---- switch (place) { ! case 0: placement = BONOBO_DOCK_LEFT; break; ! case 1: placement = BONOBO_DOCK_TOP; break; ! case 2: placement = BONOBO_DOCK_RIGHT; break; case 3: placement = BONOBO_DOCK_BOTTOM; break; default: *************** *** 48,51 **** --- 48,52 ---- 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", *************** *** 59,66 **** --- 60,71 ---- 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", *************** *** 76,83 **** --- 81,92 ---- 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", *************** *** 87,95 **** 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); } --- 96,107 ---- 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); } *************** *** 106,140 **** 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)); }; --- 118,155 ---- 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; }; *************** *** 146,150 **** int osGetToolItemPos(ToolHandle toolItem) { ! GtkWidget *toolbar = gtk_widget_get_parent(toolItem); ! return gtk_toolbar_get_item_index(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(toolItem)); } --- 161,166 ---- 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; } |