[Pspp-cvs] pspp ./Smake lib/gtksheet/ChangeLog lib/gtkshee...

[John Darrington]

CVSROOT:        /sources/pspp
Module name:    pspp
Branch:         
Changes by:     John Darrington <address@hidden>        06/05/15 08:12:18

Modified files:
        .              : Smake 
        lib/gtksheet   : ChangeLog gtksheet.c 

Log message:
        Deleted code which rendered the button labels twice.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/Smake.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/lib/gtksheet/ChangeLog.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/lib/gtksheet/gtksheet.c.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: pspp/Smake
diff -u pspp/Smake:1.31 pspp/Smake:1.32
--- pspp/Smake:1.31     Sun May 14 21:06:44 2006
+++ pspp/Smake  Mon May 15 08:12:18 2006
@@ -58,7 +58,7 @@
        $(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
Index: pspp/lib/gtksheet/ChangeLog
diff -u pspp/lib/gtksheet/ChangeLog:1.4 pspp/lib/gtksheet/ChangeLog:1.5
--- pspp/lib/gtksheet/ChangeLog:1.4     Sun May 14 00:01:39 2006
+++ pspp/lib/gtksheet/ChangeLog Mon May 15 08:12:18 2006
@@ -1,3 +1,8 @@
+Mon May 15 16:10:49 WST 2006 John Darrington <address@hidden>
+
+    * 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 <address@hidden>
 
         * gsheetmodel.c gsheetmodel.h gtksheet.c gtksheeet.h: Added
Index: pspp/lib/gtksheet/gtksheet.c
diff -u pspp/lib/gtksheet/gtksheet.c:1.5 pspp/lib/gtksheet/gtksheet.c:1.6
--- pspp/lib/gtksheet/gtksheet.c:1.5    Sun May 14 00:01:39 2006
+++ pspp/lib/gtksheet/gtksheet.c        Mon May 15 08:12:18 2006
@@ -6537,40 +6537,6 @@
            }
            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);