comparison: src/gtkwhiteboard.c
src/gtkwhiteboard.c
- changeset 11937
- 4425ec7c4d99
- parent 11914
- 81ac838f3824
- child 11938
- 6d0e6e39d7c1
equal
deleted
inserted
replaced
| 11936:1fda17e28e7b | 11937:4425ec7c4d99 |
|---|---|
| 58 | 58 |
| 59 static void gaim_gtk_whiteboard_set_canvas_as_icon(GaimGtkWhiteboard *gtkwb); | 59 static void gaim_gtk_whiteboard_set_canvas_as_icon(GaimGtkWhiteboard *gtkwb); |
| 60 | 60 |
| 61 static void gaim_gtk_whiteboard_rgb24_to_rgb48(int color_rgb, GdkColor *color); | 61 static void gaim_gtk_whiteboard_rgb24_to_rgb48(int color_rgb, GdkColor *color); |
| 62 | 62 |
| 63 #if 0 | |
| 63 static void change_color_cb(GtkColorButton *w, GaimGtkWhiteboard *gtkwb); | 64 static void change_color_cb(GtkColorButton *w, GaimGtkWhiteboard *gtkwb); |
| 65 #endif | |
| 64 | 66 |
| 65 /****************************************************************************** | 67 /****************************************************************************** |
| 66 * Globals | 68 * Globals |
| 67 *****************************************************************************/ | 69 *****************************************************************************/ |
| 68 /* | 70 /* |
| 240 gaim_gtk_whiteboard_rgb24_to_rgb48(gtkwb->brush_color, &color); | 242 gaim_gtk_whiteboard_rgb24_to_rgb48(gtkwb->brush_color, &color); |
| 241 color_button = gtk_color_button_new_with_color(&color); | 243 color_button = gtk_color_button_new_with_color(&color); |
| 242 gtk_box_pack_start(GTK_BOX(vbox_controls), color_button, FALSE, FALSE, 8); | 244 gtk_box_pack_start(GTK_BOX(vbox_controls), color_button, FALSE, FALSE, 8); |
| 243 gtk_widget_show(color_button); | 245 gtk_widget_show(color_button); |
| 244 | 246 |
| 247 #if 0 | |
| 245 g_signal_connect(G_OBJECT(color_button), "color-set", | 248 g_signal_connect(G_OBJECT(color_button), "color-set", |
| 246 G_CALLBACK(change_color_cb), gtkwb); | 249 G_CALLBACK(change_color_cb), gtkwb); |
| 250 #endif | |
| 247 } | 251 } |
| 248 | 252 |
| 249 /* Make all this (window) visible */ | 253 /* Make all this (window) visible */ |
| 250 gtk_widget_show(window); | 254 gtk_widget_show(window); |
| 251 | 255 |
| 818 color->red = (color_rgb >> 8) | 0xFF; | 822 color->red = (color_rgb >> 8) | 0xFF; |
| 819 color->green = (color_rgb & 0xFF00) | 0xFF; | 823 color->green = (color_rgb & 0xFF00) | 0xFF; |
| 820 color->blue = ((color_rgb & 0xFF) << 8) | 0xFF; | 824 color->blue = ((color_rgb & 0xFF) << 8) | 0xFF; |
| 821 } | 825 } |
| 822 | 826 |
| 827 #if 0 | |
| 823 static void | 828 static void |
| 824 change_color_cb(GtkColorButton *w, GaimGtkWhiteboard *gtkwb) | 829 change_color_cb(GtkColorButton *w, GaimGtkWhiteboard *gtkwb) |
| 825 { | 830 { |
| 826 GdkColor color; | 831 GdkColor color; |
| 827 int old_size = 5; | 832 int old_size = 5; |
| 841 | 846 |
| 842 if (prpl->set_brush) | 847 if (prpl->set_brush) |
| 843 prpl->set_brush(wb, old_size, gtkwb->brush_color); | 848 prpl->set_brush(wb, old_size, gtkwb->brush_color); |
| 844 } | 849 } |
| 845 } | 850 } |
| 846 | 851 #endif |
