Commit 385108e0 authored by Elliot Lee's avatar Elliot Lee
Browse files

gtk.m4: When testing to see if glib exists, set LIBS="$GTK_LIBS $LIBS" NOT



gtk.m4:
	When testing to see if glib exists, set
	        LIBS="$GTK_LIBS $LIBS"
	NOT
	        LIBS="$LIBS $GTK_LIBS"
	because order matters - if the user specifies their own $LIBS to
	./configure, these need to be passed in last.

gtk/Makefile.am:
	Fix problems with gtktypebuiltins* getting rebuilt every single
	time 'make' was run.

gtk/gtkcalendar.c:
	Set 'week' variable to 0 to get rid of uninitialized
	variable warning. Better solution is to give it the right value
	somewhere :)

gtk/gtkclist.c:
	When computing optimum column size, don't subtract the borders.(?)

gtk/gtkcolorsel.c:
	Don't read past end of array.
parent d9f5d8f2
......@@ -47,7 +47,7 @@ AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $GTK_CFLAGS"
LIBS="$LIBS $GTK_LIBS"
LIBS="$GTK_LIBS $LIBS"
dnl
dnl Now check if the installed GTK is sufficiently new. (Also sanity
dnl checks the results of gtk-config to some extent
......
......@@ -263,35 +263,35 @@ stamp-d: @REBUILD@ makeenums.pl gtk-boxed.defs $(source_headers) $(gdk_headers)
&& echo timestamp > stamp-d
# generate type identifier header (GTK_TYPE_WIDGET_FLAGS)
gtktypebuiltins.h: @REBUILD@ gtk.defs maketypes.awk
gtktypebuiltins.h: #@REBUILD@ gtk.defs maketypes.awk
cd $(srcdir) \
&& $(AWK) -f maketypes.awk gtk.defs macros > s-gtb \
&& mv s-gtb gtktypebuiltins.h
# generate type identifier variables (GTK_TYPE_WIDGET_FLAGS)
gtktypebuiltins_vars.c: @REBUILD@ gtk.defs maketypes.awk
$(srcdir)/gtktypebuiltins_vars.c: @REBUILD@ $(srcdir)/gtk.defs $(srcdir)/maketypes.awk
cd $(srcdir) \
&& $(AWK) -f maketypes.awk gtk.defs variables > s-gtbv \
&& mv s-gtbv gtktypebuiltins_vars.c
# generate type entries for type-id registration
gtktypebuiltins_ids.c: @REBUILD@ gtk.defs maketypes.awk
$(srcdir)/gtktypebuiltins_ids.c: @REBUILD@ $(srcdir)/gtk.defs $(srcdir)/maketypes.awk
cd $(srcdir) \
&& $(AWK) -f maketypes.awk gtk.defs entries > s-gtbi \
&& mv s-gtbi gtktypebuiltins_ids.c
# generate enum value arrays
gtktypebuiltins_evals.c: @REBUILD@ makeenums.pl gtk.defs
$(srcdir)/gtktypebuiltins_evals.c: @REBUILD@ $(srcdir)/makeenums.pl $(srcdir)/gtk.defs
cd $(srcdir) \
&& $(PERL) makeenums.pl arrays $(source_headers) $(gdk_headers) > \
s-gtbe \
&& mv s-gtbe gtktypebuiltins_evals.c
#gtkmarshal.c gtkmarshal.h: @REBUILD@ stamp-m
# @:
$(srcdir)/gtkmarshal.c $(srcdir)/gtkmarshal.h: @REBUILD@ stamp-m
@:
stamp-m: @REBUILD@ gtkmarshal.list genmarshal.pl
(cd $(srcdir); srcdir=$(srcdir) INDENT=$(INDENT) $(PERL) $(srcdir)/genmarshal.pl \
stamp-m: @REBUILD@ $(srcdir)/gtkmarshal.list $(srcdir)/genmarshal.pl
(srcdir=$(srcdir) INDENT=$(INDENT) $(PERL) $(srcdir)/genmarshal.pl \
&& (cmp -s s-gmc gtkmarshal.c || mv s-gmc gtkmarshal.c) && rm -f s-gmc \
&& (cmp -s s-gmh gtkmarshal.h || mv s-gmh gtkmarshal.h) && rm -f s-gmh) \
&& echo timestamp > stamp-m
......
......@@ -1675,7 +1675,7 @@ gtk_calendar_paint_week_numbers (GtkWidget *widget)
{
GtkCalendar *calendar;
GdkGC *gc;
gint row, week, year;
gint row, week = 0, year;
gint x_loc;
char buffer[3];
gint y_baseline, day_height;
......
......@@ -1753,8 +1753,11 @@ gtk_clist_optimal_column_width (GtkCList *clist,
return 0;
if (GTK_CLIST_SHOW_TITLES(clist) && clist->column[column].button)
width = (clist->column[column].button->requisition.width -
(CELL_SPACING + (2 * COLUMN_INSET)));
width = (clist->column[column].button->requisition.width)
#if 0
(CELL_SPACING + (2 * COLUMN_INSET)))
#endif
;
else
width = 0;
......
......@@ -939,7 +939,7 @@ gtk_color_selection_drag_handle (GtkWidget *widget,
vals[2] = colors[2] * 0xffff;
vals[3] = colorsel->use_opacity ? colors[3] * 0xffff : 0xffff;
g_print ("%x %x\n", vals[0], vals[4]);
g_print ("%x %x\n", vals[0], vals[3]);
g_print ("%g\n", colorsel->values[OPACITY]);
g_print ("%d\n", colorsel->use_opacity);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment