diff options
| author | Christopher James Lahey <clahey@ximian.com> | 2001-10-24 03:48:19 +0800 |
|---|---|---|
| committer | Chris Lahey <clahey@src.gnome.org> | 2001-10-24 03:48:19 +0800 |
| commit | 2def5aacb2ade53ff07a9d6b9f63438fe01e877b (patch) | |
| tree | 7fff79b728b7fd7c1a149e6618999d79b8ae35d2 /widgets/table/e-table-field-chooser-item.c | |
| parent | 83c1664ef72b6c4a905db6f27f21c841d4328def (diff) | |
| download | gsoc2013-evolution-2def5aacb2ade53ff07a9d6b9f63438fe01e877b.tar.gz gsoc2013-evolution-2def5aacb2ade53ff07a9d6b9f63438fe01e877b.tar.zst gsoc2013-evolution-2def5aacb2ade53ff07a9d6b9f63438fe01e877b.zip | |
Got rid of the gc argument to e_table_header_draw_button.
2001-10-23 Christopher James Lahey <clahey@ximian.com>
* e-table-field-chooser-item.c: Got rid of the gc argument to
e_table_header_draw_button.
(etfci_font_load): Just use the style font here.
* e-table-group-container.c (e_table_group_container_construct):
Changed this to just use the font from the style. Fixes Ximian
bug #11882.
* e-table-header-item.c: Got rid of the gc argument to
e_table_header_draw_button.
(ethi_font_load): Changed this to just fallback on the font from
the style if the fontname is NULL or doesn't load to a font.
Fixes Ximian bug #11882.
* e-table-header-utils.c, e-table-header-utils.h
(e_table_header_draw_button): Got rid of the gc parameter here and
changed to use the gc from the style of a button created for this
purpose, but not shown. Fixes Ximian bug #13251.
svn path=/trunk/; revision=13949
Diffstat (limited to 'widgets/table/e-table-field-chooser-item.c')
| -rw-r--r-- | widgets/table/e-table-field-chooser-item.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c index 20f3b4b0d8..e966c6be31 100644 --- a/widgets/table/e-table-field-chooser-item.c +++ b/widgets/table/e-table-field-chooser-item.c @@ -197,19 +197,13 @@ etfci_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, int flag } static void -etfci_font_load (ETableFieldChooserItem *etfci, char *font) +etfci_font_load (ETableFieldChooserItem *etfci) { if (etfci->font) gdk_font_unref (etfci->font); - etfci->font = NULL; - if (font) - etfci->font = gdk_fontset_load (font); - - if (etfci->font == NULL) { - etfci->font = GTK_WIDGET(GNOME_CANVAS_ITEM(etfci)->canvas)->style->font; - gdk_font_ref(etfci->font); - } + etfci->font = GTK_WIDGET(GNOME_CANVAS_ITEM(etfci)->canvas)->style->font; + gdk_font_ref(etfci->font); } static void @@ -411,7 +405,7 @@ etfci_realize (GnomeCanvasItem *item) window = GTK_WIDGET (item->canvas)->window; if (!etfci->font) - etfci_font_load (etfci, NULL); + etfci_font_load (etfci); etfci->drag_end_id = gtk_signal_connect ( GTK_OBJECT (item->canvas), "drag_end", @@ -478,7 +472,7 @@ etfci_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int widt e_table_header_draw_button (drawable, ecol, style, etfci->font, state, - GTK_WIDGET (canvas), style->fg_gc[GTK_STATE_NORMAL], + GTK_WIDGET (canvas), -x, y1 - y, width, height, etfci->width, y2 - y1, @@ -547,7 +541,7 @@ etfci_start_drag (ETableFieldChooserItem *etfci, GdkEvent *event, double x, doub e_table_header_draw_button (pixmap, ecol, widget->style, etfci->font, GTK_WIDGET_STATE (widget), - widget, widget->style->fg_gc[GTK_STATE_NORMAL], + widget, 0, 0, etfci->width, button_height, etfci->width, button_height, |