From a41320734db91e05381eb4235e92ed0131bb776c Mon Sep 17 00:00:00 2001 From: John Darrington Date: Mon, 15 May 2006 08:12:18 +0000 Subject: [PATCH] Deleted code which rendered the button labels twice. --- Smake | 2 +- lib/gtksheet/ChangeLog | 5 +++++ lib/gtksheet/gtksheet.c | 34 ---------------------------------- 3 files changed, 6 insertions(+), 35 deletions(-) diff --git a/Smake b/Smake index 764044cb..a13ce6b5 100644 --- a/Smake +++ b/Smake @@ -58,7 +58,7 @@ all: po/POTFILES.in $(GNULIB_TOOL) --import --no-changelog --m4-base=gl/m4 \ --source-base=gl --lib=libgl --tests-base=tests \ --import $(GNULIB_MODULES) - autopoint + autopoint --force aclocal -I m4 -I gl/m4 autoconf autoheader diff --git a/lib/gtksheet/ChangeLog b/lib/gtksheet/ChangeLog index 32d12736..596afc3d 100644 --- a/lib/gtksheet/ChangeLog +++ b/lib/gtksheet/ChangeLog @@ -1,3 +1,8 @@ +Mon May 15 16:10:49 WST 2006 John Darrington + + * gtksheet.c: Removed code which rendered the title buttons a second + time. Cut and Paste error ? + Sat May 13 07:58:32 WST 2006 John Darrington * gsheetmodel.c gsheetmodel.h gtksheet.c gtksheeet.h: Added diff --git a/lib/gtksheet/gtksheet.c b/lib/gtksheet/gtksheet.c index c7c3f7a8..dd7d4190 100644 --- a/lib/gtksheet/gtksheet.c +++ b/lib/gtksheet/gtksheet.c @@ -6537,40 +6537,6 @@ gtk_sheet_button_draw (GtkSheet *sheet, gint row, gint column) } g_free(line); } - if(button->label && strlen(button->label) > 0){ - PangoLayout *layout = NULL; - gint real_x = x, real_y = y; - - text_width = STRING_WIDTH(GTK_WIDGET(sheet), GTK_WIDGET(sheet)->style->font_desc, button->label); - - layout = gtk_widget_create_pango_layout (GTK_WIDGET(sheet), button->label); - switch(button->justification){ - case GTK_JUSTIFY_LEFT: - real_x = x + CELLOFFSET; - align = rtl ? PANGO_ALIGN_RIGHT : PANGO_ALIGN_LEFT; - break; - case GTK_JUSTIFY_RIGHT: - real_x = x + width - text_width - CELLOFFSET; - align = rtl ? PANGO_ALIGN_LEFT : PANGO_ALIGN_RIGHT; - break; - case GTK_JUSTIFY_CENTER: - default: - real_x = x + (width - text_width)/2; - align = rtl ? PANGO_ALIGN_RIGHT : PANGO_ALIGN_LEFT; - pango_layout_set_justify (layout, TRUE); - } - pango_layout_set_alignment (layout, align); - gtk_paint_layout (GTK_WIDGET(sheet)->style, - window, - state, - FALSE, - &allocation, - GTK_WIDGET(sheet), - "label", - real_x, real_y, - layout); - g_object_unref(G_OBJECT(layout)); - } gdk_gc_set_clip_rectangle(GTK_WIDGET(sheet)->style->fg_gc[button->state], NULL); -- 2.30.2