comparison: src/gtkimhtmltoolbar.c
src/gtkimhtmltoolbar.c
- changeset 10080
- d562573fff16
- parent 9971
- 8291bafb0025
- child 10085
- 83a9e1d81442
equal
deleted
inserted
replaced
| 10079:d4eaff5517fb | 10080:d562573fff16 |
|---|---|
| 31 | 31 |
| 32 #include "gtkdialogs.h" | 32 #include "gtkdialogs.h" |
| 33 #include "gtkimhtmltoolbar.h" | 33 #include "gtkimhtmltoolbar.h" |
| 34 #include "gtkutils.h" | 34 #include "gtkutils.h" |
| 35 | 35 |
| 36 static GtkVBoxClass *parent_class = NULL; | 36 static GtkHBoxClass *parent_class = NULL; |
| 37 | 37 |
| 38 static void do_bold(GtkWidget *bold, GtkIMHtmlToolbar *toolbar) | 38 static void do_bold(GtkWidget *bold, GtkIMHtmlToolbar *toolbar) |
| 39 { | 39 { |
| 40 GObject *object; | 40 GObject *object; |
| 41 | 41 |
| 847 { | 847 { |
| 848 GtkObjectClass *object_class; | 848 GtkObjectClass *object_class; |
| 849 GObjectClass *gobject_class; | 849 GObjectClass *gobject_class; |
| 850 object_class = (GtkObjectClass*) class; | 850 object_class = (GtkObjectClass*) class; |
| 851 gobject_class = (GObjectClass*) class; | 851 gobject_class = (GObjectClass*) class; |
| 852 parent_class = gtk_type_class(GTK_TYPE_VBOX); | 852 parent_class = gtk_type_class(GTK_TYPE_HBOX); |
| 853 /* signals[URL_CLICKED] = g_signal_new(url_clicked", | |
| 854 G_TYPE_FROM_CLASS(gobject_class), | |
| 855 G_SIGNAL_RUN_FIRST, | |
| 856 G_STRUCT_OFFSET(GtkIMHtmlClass, url_clicked), | |
| 857 NULL, | |
| 858 0, | |
| 859 g_cclosure_marshal_VOID__POINTER, | |
| 860 G_TYPE_NONE, 1, | |
| 861 G_TYPE_POINTER);*/ | |
| 862 gobject_class->finalize = gtk_imhtmltoolbar_finalize; | 853 gobject_class->finalize = gtk_imhtmltoolbar_finalize; |
| 863 } | 854 } |
| 864 | 855 |
| 865 static void gtk_imhtmltoolbar_init (GtkIMHtmlToolbar *toolbar) | 856 static void gtk_imhtmltoolbar_init (GtkIMHtmlToolbar *toolbar) |
| 866 { | 857 { |
| 867 GtkWidget *hbox; | 858 GtkWidget *hbox = GTK_HBOX(toolbar); |
| 868 GtkWidget *button; | 859 GtkWidget *button; |
| 869 GtkWidget *sep; | 860 GtkWidget *sep; |
| 870 GtkSizeGroup *sg; | 861 GtkSizeGroup *sg; |
| 871 | 862 |
| 872 toolbar->imhtml = NULL; | 863 toolbar->imhtml = NULL; |
| 876 toolbar->link_dialog = NULL; | 867 toolbar->link_dialog = NULL; |
| 877 toolbar->smiley_dialog = NULL; | 868 toolbar->smiley_dialog = NULL; |
| 878 toolbar->image_dialog = NULL; | 869 toolbar->image_dialog = NULL; |
| 879 | 870 |
| 880 toolbar->tooltips = gtk_tooltips_new(); | 871 toolbar->tooltips = gtk_tooltips_new(); |
| 881 | 872 |
| 873 gtk_box_set_spacing(GTK_BOX(toolbar), 6); | |
| 882 sg = gtk_size_group_new(GTK_SIZE_GROUP_BOTH); | 874 sg = gtk_size_group_new(GTK_SIZE_GROUP_BOTH); |
| 883 | |
| 884 sep = gtk_hseparator_new(); | |
| 885 gtk_box_pack_start(GTK_BOX(toolbar), sep, FALSE, FALSE, 0); | |
| 886 gtk_widget_show(sep); | |
| 887 | |
| 888 hbox = gtk_hbox_new(FALSE, 6); | |
| 889 gtk_box_pack_start(GTK_BOX(toolbar), hbox, FALSE, FALSE, 0); | |
| 890 | 875 |
| 891 /* Bold */ | 876 /* Bold */ |
| 892 button = gaim_pixbuf_toolbar_button_from_stock(GTK_STOCK_BOLD); | 877 button = gaim_pixbuf_toolbar_button_from_stock(GTK_STOCK_BOLD); |
| 893 gtk_size_group_add_widget(sg, button); | 878 gtk_size_group_add_widget(sg, button); |
| 894 gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); | 879 gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); |
| 1024 g_signal_connect(G_OBJECT(button), "clicked", | 1009 g_signal_connect(G_OBJECT(button), "clicked", |
| 1025 G_CALLBACK(insert_smiley_cb), toolbar); | 1010 G_CALLBACK(insert_smiley_cb), toolbar); |
| 1026 | 1011 |
| 1027 toolbar->smiley = button; | 1012 toolbar->smiley = button; |
| 1028 | 1013 |
| 1029 | |
| 1030 sep = gtk_hseparator_new(); | |
| 1031 gtk_box_pack_start(GTK_BOX(toolbar), sep, FALSE, FALSE, 0); | |
| 1032 gtk_widget_show(sep); | |
| 1033 toolbar->sml = NULL; | 1014 toolbar->sml = NULL; |
| 1034 gtk_widget_show_all(hbox); | 1015 gtk_widget_show_all(hbox); |
| 1035 } | 1016 } |
| 1036 | 1017 |
| 1037 GtkWidget *gtk_imhtmltoolbar_new() | 1018 GtkWidget *gtk_imhtmltoolbar_new() |
| 1054 sizeof (GtkIMHtmlToolbar), | 1035 sizeof (GtkIMHtmlToolbar), |
| 1055 0, | 1036 0, |
| 1056 (GInstanceInitFunc) gtk_imhtmltoolbar_init | 1037 (GInstanceInitFunc) gtk_imhtmltoolbar_init |
| 1057 }; | 1038 }; |
| 1058 | 1039 |
| 1059 imhtmltoolbar_type = g_type_register_static(GTK_TYPE_VBOX, | 1040 imhtmltoolbar_type = g_type_register_static(GTK_TYPE_HBOX, |
| 1060 "GtkIMHtmlToolbar", &imhtmltoolbar_info, 0); | 1041 "GtkIMHtmlToolbar", &imhtmltoolbar_info, 0); |
| 1061 } | 1042 } |
| 1062 | 1043 |
| 1063 return imhtmltoolbar_type; | 1044 return imhtmltoolbar_type; |
| 1064 } | 1045 } |
