[Commits] gtkshruler.c 1.1.4.20 1.1.4.21 gtkutils.h 1.4.2.63 1.4.2.64

[colin at claws-mail.org]

Update of /home/claws-mail/claws/src/gtk
In directory claws-mail:/tmp/cvs-serv3778/src/gtk

Modified Files:
      Tag: gtk2
	gtkshruler.c gtkutils.h 
Log Message:
2011-10-22 [colin]	3.7.10cvs42

	* src/printing.c
	* src/gtk/gtkshruler.c
	* src/gtk/gtkutils.h
		Fix GTK+2.16 build

Index: gtkutils.h
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/gtkutils.h,v
retrieving revision 1.4.2.63
retrieving revision 1.4.2.64
diff -u -d -r1.4.2.63 -r1.4.2.64
--- gtkutils.h	22 Oct 2011 17:09:04 -0000	1.4.2.63
+++ gtkutils.h	22 Oct 2011 18:22:34 -0000	1.4.2.64
@@ -238,6 +238,8 @@
 #define gtk_widget_get_mapped(x) (GTK_WIDGET_MAPPED(x))
 #endif
 #if !GTK_CHECK_VERSION(2,18,0)
+#define gtk_widget_get_allocation(x,a) (*(a) = (x)->allocation)
+#define gtk_widget_set_allocation(x,a) ((x)->allocation = *(a))
 #define gtk_widget_has_focus(x) (GTK_WIDGET_HAS_FOCUS(x))
 #define gtk_widget_get_can_focus(x) (GTK_WIDGET_CAN_FOCUS(x))
 #define gtk_widget_has_grab(x) (GTK_WIDGET_HAS_GRAB(x))
@@ -250,5 +252,11 @@
 #define gtk_widget_get_mapped(x) (GTK_WIDGET_MAPPED(x))
 #define gtk_widget_get_has_window(x) (!(GTK_WIDGET_NO_WINDOW(x)))
 #define gtk_widget_get_app_paintable(x) (GTK_WIDGET_APP_PAINTABLE(x))
+#define gtk_widget_set_window(x,w) {			\
+	if ((x)->window != w) {				\
+		(x)->window = w;			\
+		g_object_notify (G_OBJECT(x), "window");\
+	}						\
+}
 #endif
 #endif /* __GTKUTILS_H__ */

Index: gtkshruler.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/gtkshruler.c,v
retrieving revision 1.1.4.20
retrieving revision 1.1.4.21
diff -u -d -r1.1.4.20 -r1.1.4.21
--- gtkshruler.c	17 Oct 2011 18:44:40 -0000	1.1.4.20
+++ gtkshruler.c	22 Oct 2011 18:22:34 -0000	1.1.4.21
@@ -23,6 +23,7 @@
 
 #include <gtk/gtk.h>
 
+#include "gtkutils.h"
 #include "gtkshruler.h"
 #include "gtkunit.h"
 
@@ -263,7 +264,7 @@
 {
   GtkSHRulerPrivate *priv = GTK_SHRULER_GET_PRIVATE (ruler);
 
-  gtk_widget_set_has_window (GTK_WIDGET (ruler), FALSE);
+  gtkut_widget_set_has_window (GTK_WIDGET (ruler), FALSE);
 
   priv->orientation   = GTK_ORIENTATION_HORIZONTAL;
   priv->unit          = GTK_PIXELS;