Honor tree->view_lines. (gtk-guy-990611-3.patch: Guy Harris

Wed Aug 11 01:04:57 1999  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtktreeitem.c (gtk_tree_item_draw_lines): Honor
	tree->view_lines.
	(gtk-guy-990611-3.patch: Guy Harris <guy@netapp.com>)

	* gtk/Makefile.am (install-data-local): Solaris apparently
	has various troubles with ln -f; use rm first instead.
	(gtk-guy-990611-2.patch: Guy Harris <guy@netapp.com>)

	* gdk/gdkproperty.c (gdk_property_get): Fix assumption
	that format 32 => sizeof(item) == 4. It really is
	sizeof(long).

12 files changed, 124 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index cffc14d66..b0061b814 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+Wed Aug 11 01:04:57 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtktreeitem.c (gtk_tree_item_draw_lines): Honor
+	tree->view_lines.
+	(gtk-guy-990611-3.patch: Guy Harris <guy@netapp.com>)
+
+	* gtk/Makefile.am (install-data-local): Solaris apparently
+	has various troubles with ln -f; use rm first instead.
+	(gtk-guy-990611-2.patch: Guy Harris <guy@netapp.com>)
+
+	* gdk/gdkproperty.c (gdk_property_get): Fix assumption
+	that format 32 => sizeof(item) == 4. It really is
+	sizeof(long).
+
 1999-07-30  Raja R Harinath  <harinath@cs.umn.edu>
 
 	* gtk/Makefile.am (stamp-m): Don't `mv' from builddir to srcdir,
@@ -127,6 +141,7 @@ Tue Jun 29 15:59:25 1999  Owen Taylor  <otaylor@redhat.com>
 	* configure.in (LIBS): Look for libgmodule in the
 	right location.
 
+>>>>>>> 1.1061.2.97
 Mon Jun 28 09:29:52 1999  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkwindow.c: add ::default_width and ::default_height arguments.
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index cffc14d66..b0061b814 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,17 @@
+Wed Aug 11 01:04:57 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtktreeitem.c (gtk_tree_item_draw_lines): Honor
+	tree->view_lines.
+	(gtk-guy-990611-3.patch: Guy Harris <guy@netapp.com>)
+
+	* gtk/Makefile.am (install-data-local): Solaris apparently
+	has various troubles with ln -f; use rm first instead.
+	(gtk-guy-990611-2.patch: Guy Harris <guy@netapp.com>)
+
+	* gdk/gdkproperty.c (gdk_property_get): Fix assumption
+	that format 32 => sizeof(item) == 4. It really is
+	sizeof(long).
+
 1999-07-30  Raja R Harinath  <harinath@cs.umn.edu>
 
 	* gtk/Makefile.am (stamp-m): Don't `mv' from builddir to srcdir,
@@ -127,6 +141,7 @@ Tue Jun 29 15:59:25 1999  Owen Taylor  <otaylor@redhat.com>
 	* configure.in (LIBS): Look for libgmodule in the
 	right location.
 
+>>>>>>> 1.1061.2.97
 Mon Jun 28 09:29:52 1999  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkwindow.c: add ::default_width and ::default_height arguments.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index cffc14d66..b0061b814 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,17 @@
+Wed Aug 11 01:04:57 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtktreeitem.c (gtk_tree_item_draw_lines): Honor
+	tree->view_lines.
+	(gtk-guy-990611-3.patch: Guy Harris <guy@netapp.com>)
+
+	* gtk/Makefile.am (install-data-local): Solaris apparently
+	has various troubles with ln -f; use rm first instead.
+	(gtk-guy-990611-2.patch: Guy Harris <guy@netapp.com>)
+
+	* gdk/gdkproperty.c (gdk_property_get): Fix assumption
+	that format 32 => sizeof(item) == 4. It really is
+	sizeof(long).
+
 1999-07-30  Raja R Harinath  <harinath@cs.umn.edu>
 
 	* gtk/Makefile.am (stamp-m): Don't `mv' from builddir to srcdir,
@@ -127,6 +141,7 @@ Tue Jun 29 15:59:25 1999  Owen Taylor  <otaylor@redhat.com>
 	* configure.in (LIBS): Look for libgmodule in the
 	right location.
 
+>>>>>>> 1.1061.2.97
 Mon Jun 28 09:29:52 1999  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkwindow.c: add ::default_width and ::default_height arguments.
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index cffc14d66..b0061b814 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,17 @@
+Wed Aug 11 01:04:57 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtktreeitem.c (gtk_tree_item_draw_lines): Honor
+	tree->view_lines.
+	(gtk-guy-990611-3.patch: Guy Harris <guy@netapp.com>)
+
+	* gtk/Makefile.am (install-data-local): Solaris apparently
+	has various troubles with ln -f; use rm first instead.
+	(gtk-guy-990611-2.patch: Guy Harris <guy@netapp.com>)
+
+	* gdk/gdkproperty.c (gdk_property_get): Fix assumption
+	that format 32 => sizeof(item) == 4. It really is
+	sizeof(long).
+
 1999-07-30  Raja R Harinath  <harinath@cs.umn.edu>
 
 	* gtk/Makefile.am (stamp-m): Don't `mv' from builddir to srcdir,
@@ -127,6 +141,7 @@ Tue Jun 29 15:59:25 1999  Owen Taylor  <otaylor@redhat.com>
 	* configure.in (LIBS): Look for libgmodule in the
 	right location.
 
+>>>>>>> 1.1061.2.97
 Mon Jun 28 09:29:52 1999  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkwindow.c: add ::default_width and ::default_height arguments.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index cffc14d66..b0061b814 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,17 @@
+Wed Aug 11 01:04:57 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtktreeitem.c (gtk_tree_item_draw_lines): Honor
+	tree->view_lines.
+	(gtk-guy-990611-3.patch: Guy Harris <guy@netapp.com>)
+
+	* gtk/Makefile.am (install-data-local): Solaris apparently
+	has various troubles with ln -f; use rm first instead.
+	(gtk-guy-990611-2.patch: Guy Harris <guy@netapp.com>)
+
+	* gdk/gdkproperty.c (gdk_property_get): Fix assumption
+	that format 32 => sizeof(item) == 4. It really is
+	sizeof(long).
+
 1999-07-30  Raja R Harinath  <harinath@cs.umn.edu>
 
 	* gtk/Makefile.am (stamp-m): Don't `mv' from builddir to srcdir,
@@ -127,6 +141,7 @@ Tue Jun 29 15:59:25 1999  Owen Taylor  <otaylor@redhat.com>
 	* configure.in (LIBS): Look for libgmodule in the
 	right location.
 
+>>>>>>> 1.1061.2.97
 Mon Jun 28 09:29:52 1999  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkwindow.c: add ::default_width and ::default_height arguments.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index cffc14d66..b0061b814 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,17 @@
+Wed Aug 11 01:04:57 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtktreeitem.c (gtk_tree_item_draw_lines): Honor
+	tree->view_lines.
+	(gtk-guy-990611-3.patch: Guy Harris <guy@netapp.com>)
+
+	* gtk/Makefile.am (install-data-local): Solaris apparently
+	has various troubles with ln -f; use rm first instead.
+	(gtk-guy-990611-2.patch: Guy Harris <guy@netapp.com>)
+
+	* gdk/gdkproperty.c (gdk_property_get): Fix assumption
+	that format 32 => sizeof(item) == 4. It really is
+	sizeof(long).
+
 1999-07-30  Raja R Harinath  <harinath@cs.umn.edu>
 
 	* gtk/Makefile.am (stamp-m): Don't `mv' from builddir to srcdir,
@@ -127,6 +141,7 @@ Tue Jun 29 15:59:25 1999  Owen Taylor  <otaylor@redhat.com>
 	* configure.in (LIBS): Look for libgmodule in the
 	right location.
 
+>>>>>>> 1.1061.2.97
 Mon Jun 28 09:29:52 1999  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkwindow.c: add ::default_width and ::default_height arguments.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index cffc14d66..b0061b814 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,17 @@
+Wed Aug 11 01:04:57 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtktreeitem.c (gtk_tree_item_draw_lines): Honor
+	tree->view_lines.
+	(gtk-guy-990611-3.patch: Guy Harris <guy@netapp.com>)
+
+	* gtk/Makefile.am (install-data-local): Solaris apparently
+	has various troubles with ln -f; use rm first instead.
+	(gtk-guy-990611-2.patch: Guy Harris <guy@netapp.com>)
+
+	* gdk/gdkproperty.c (gdk_property_get): Fix assumption
+	that format 32 => sizeof(item) == 4. It really is
+	sizeof(long).
+
 1999-07-30  Raja R Harinath  <harinath@cs.umn.edu>
 
 	* gtk/Makefile.am (stamp-m): Don't `mv' from builddir to srcdir,
@@ -127,6 +141,7 @@ Tue Jun 29 15:59:25 1999  Owen Taylor  <otaylor@redhat.com>
 	* configure.in (LIBS): Look for libgmodule in the
 	right location.
 
+>>>>>>> 1.1061.2.97
 Mon Jun 28 09:29:52 1999  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkwindow.c: add ::default_width and ::default_height arguments.
diff --git a/gdk/gdk.h b/gdk/gdk.h
index d3afbacbe..995116e34 100644
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -479,8 +479,8 @@ GdkPixmap* gdk_pixmap_create_from_xpm	(GdkWindow  *window,
 					 GdkBitmap **mask,
 					 GdkColor   *transparent_color,
 					 const gchar *filename);
-GdkPixmap* gdk_pixmap_colormap_create_from_xpm 
-                                        (GdkWindow   *window,
+GdkPixmap* gdk_pixmap_colormap_create_from_xpm (
+					 GdkWindow   *window,
 					 GdkColormap *colormap,
 					 GdkBitmap  **mask,
 					 GdkColor    *transparent_color,
@@ -489,8 +489,8 @@ GdkPixmap* gdk_pixmap_create_from_xpm_d (GdkWindow  *window,
 					 GdkBitmap **mask,
 					 GdkColor   *transparent_color,
 					 gchar	   **data);
-GdkPixmap* gdk_pixmap_colormap_create_from_xpm_d 
-                                        (GdkWindow   *window,
+GdkPixmap* gdk_pixmap_colormap_create_from_xpm_d (
+					 GdkWindow   *window,
 					 GdkColormap *colormap,
 					 GdkBitmap  **mask,
 					 GdkColor    *transparent_color,
diff --git a/gdk/gdkproperty.c b/gdk/gdkproperty.c
index 691aa646d..59c3e38df 100644
--- a/gdk/gdkproperty.c
+++ b/gdk/gdkproperty.c
@@ -163,10 +163,10 @@ gdk_property_get (GdkWindow   *window,
 	  ret_length = ret_nitems;
 	  break;
 	case 16:
-	  ret_length = 2 * ret_nitems;
+	  ret_length = sizeof(short) * ret_nitems;
 	  break;
 	case 32:
-	  ret_length = 4 * ret_nitems;
+	  ret_length = sizeof(long) * ret_nitems;
 	  break;
 	default:
 	  g_warning ("unknown property return format: %d", ret_format);
diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c
index 691aa646d..59c3e38df 100644
--- a/gdk/x11/gdkproperty-x11.c
+++ b/gdk/x11/gdkproperty-x11.c
@@ -163,10 +163,10 @@ gdk_property_get (GdkWindow   *window,
 	  ret_length = ret_nitems;
 	  break;
 	case 16:
-	  ret_length = 2 * ret_nitems;
+	  ret_length = sizeof(short) * ret_nitems;
 	  break;
 	case 32:
-	  ret_length = 4 * ret_nitems;
+	  ret_length = sizeof(long) * ret_nitems;
 	  break;
 	default:
 	  g_warning ("unknown property return format: %d", ret_format);
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 4b3039d7e..7c7d42144 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -328,7 +328,8 @@ install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(gtkconfdir)
 	cd $(DESTDIR)$(gtkconfdir) && \
 	  for i in cs hr hu pl sk sl ; do \
-            ln -s -f gtkrc.iso-8859-2 gtkrc.$$i ; \
+	    rm -f gtkrc.$$i ; \
+            ln -s gtkrc.iso-8859-2 gtkrc.$$i ; \
           done
 
 uninstall-local:
diff --git a/gtk/gtktreeitem.c b/gtk/gtktreeitem.c
index 1324819ce..da2753eb4 100644
--- a/gtk/gtktreeitem.c
+++ b/gtk/gtktreeitem.c
@@ -583,6 +583,9 @@ gtk_tree_item_draw_lines (GtkWidget *widget)
   item = GTK_TREE_ITEM(widget);
   tree = GTK_TREE(widget->parent);
 
+  if (!tree->view_line)
+    return;
+
   /* draw vertical line */
   lx1 = item->pixmaps_box->allocation.width;
   lx1 = lx2 = ((lx1 / 2) + (lx1 % 2) + 
@@ -645,6 +648,12 @@ gtk_tree_item_paint (GtkWidget    *widget,
   g_return_if_fail (GTK_IS_TREE_ITEM (widget));
   g_return_if_fail (area != NULL);
 
+  /* FIXME: We should honor tree->view_mode, here - I think
+   * the desired effect is that when the mode is VIEW_ITEM,
+   * only the subitem is drawn as selected, not the entire
+   * line. (Like the way that the tree in Windows Explorer
+   * works).
+   */
   if (GTK_WIDGET_DRAWABLE (widget))
     {
       bin = GTK_BIN (widget);