changed to 64 (gtk_clist_draw_focus) (hadjustment_value_changed)

Mon Feb  8 21:00:20 1999  Lars Hamann  <lars@gtk.org>

	* gtk/gtkclist.c (CLIST_OPTIMUM_SIZE): changed to 64
	(gtk_clist_draw_focus) (hadjustment_value_changed) (draw_row):
 	few fixes to respect GTK_CAN_FOCUS flag.

	* gtk/gtkctree.c (draw_row):
 	respect GTK_CAN_FOCUS flag.

diff --git a/ChangeLog b/ChangeLog
index 39968de55cc77247fe916a946c338d2ee410972e..775ea8309cea749e83511d794e2b62537f9aab70 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Mon Feb  8 21:00:20 1999  Lars Hamann  <lars@gtk.org>
+
+       * gtk/gtkclist.c (CLIST_OPTIMUM_SIZE): changed to 64
+       (gtk_clist_draw_focus) (hadjustment_value_changed) (draw_row):
+       few fixes to respect GTK_CAN_FOCUS flag.
+
+       * gtk/gtkctree.c (draw_row): 
+       respect GTK_CAN_FOCUS flag.
+
 Mon Feb  8 19:22:27 GMT 1999 Tony Gale  <gale@gtk.org>
 
        * example/colorsel/*: missing from the CVS for some reason

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 39968de55cc77247fe916a946c338d2ee410972e..775ea8309cea749e83511d794e2b62537f9aab70 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,12 @@
+Mon Feb  8 21:00:20 1999  Lars Hamann  <lars@gtk.org>
+
+       * gtk/gtkclist.c (CLIST_OPTIMUM_SIZE): changed to 64
+       (gtk_clist_draw_focus) (hadjustment_value_changed) (draw_row):
+       few fixes to respect GTK_CAN_FOCUS flag.
+
+       * gtk/gtkctree.c (draw_row): 
+       respect GTK_CAN_FOCUS flag.
+
 Mon Feb  8 19:22:27 GMT 1999 Tony Gale  <gale@gtk.org>
 
        * example/colorsel/*: missing from the CVS for some reason

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 39968de55cc77247fe916a946c338d2ee410972e..775ea8309cea749e83511d794e2b62537f9aab70 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+Mon Feb  8 21:00:20 1999  Lars Hamann  <lars@gtk.org>
+
+       * gtk/gtkclist.c (CLIST_OPTIMUM_SIZE): changed to 64
+       (gtk_clist_draw_focus) (hadjustment_value_changed) (draw_row):
+       few fixes to respect GTK_CAN_FOCUS flag.
+
+       * gtk/gtkctree.c (draw_row): 
+       respect GTK_CAN_FOCUS flag.
+
 Mon Feb  8 19:22:27 GMT 1999 Tony Gale  <gale@gtk.org>
 
        * example/colorsel/*: missing from the CVS for some reason

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 39968de55cc77247fe916a946c338d2ee410972e..775ea8309cea749e83511d794e2b62537f9aab70 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,12 @@
+Mon Feb  8 21:00:20 1999  Lars Hamann  <lars@gtk.org>
+
+       * gtk/gtkclist.c (CLIST_OPTIMUM_SIZE): changed to 64
+       (gtk_clist_draw_focus) (hadjustment_value_changed) (draw_row):
+       few fixes to respect GTK_CAN_FOCUS flag.
+
+       * gtk/gtkctree.c (draw_row): 
+       respect GTK_CAN_FOCUS flag.
+
 Mon Feb  8 19:22:27 GMT 1999 Tony Gale  <gale@gtk.org>
 
        * example/colorsel/*: missing from the CVS for some reason

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 39968de55cc77247fe916a946c338d2ee410972e..775ea8309cea749e83511d794e2b62537f9aab70 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+Mon Feb  8 21:00:20 1999  Lars Hamann  <lars@gtk.org>
+
+       * gtk/gtkclist.c (CLIST_OPTIMUM_SIZE): changed to 64
+       (gtk_clist_draw_focus) (hadjustment_value_changed) (draw_row):
+       few fixes to respect GTK_CAN_FOCUS flag.
+
+       * gtk/gtkctree.c (draw_row): 
+       respect GTK_CAN_FOCUS flag.
+
 Mon Feb  8 19:22:27 GMT 1999 Tony Gale  <gale@gtk.org>
 
        * example/colorsel/*: missing from the CVS for some reason

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 39968de55cc77247fe916a946c338d2ee410972e..775ea8309cea749e83511d794e2b62537f9aab70 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+Mon Feb  8 21:00:20 1999  Lars Hamann  <lars@gtk.org>
+
+       * gtk/gtkclist.c (CLIST_OPTIMUM_SIZE): changed to 64
+       (gtk_clist_draw_focus) (hadjustment_value_changed) (draw_row):
+       few fixes to respect GTK_CAN_FOCUS flag.
+
+       * gtk/gtkctree.c (draw_row): 
+       respect GTK_CAN_FOCUS flag.
+
 Mon Feb  8 19:22:27 GMT 1999 Tony Gale  <gale@gtk.org>
 
        * example/colorsel/*: missing from the CVS for some reason

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 39968de55cc77247fe916a946c338d2ee410972e..775ea8309cea749e83511d794e2b62537f9aab70 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+Mon Feb  8 21:00:20 1999  Lars Hamann  <lars@gtk.org>
+
+       * gtk/gtkclist.c (CLIST_OPTIMUM_SIZE): changed to 64
+       (gtk_clist_draw_focus) (hadjustment_value_changed) (draw_row):
+       few fixes to respect GTK_CAN_FOCUS flag.
+
+       * gtk/gtkctree.c (draw_row): 
+       respect GTK_CAN_FOCUS flag.
+
 Mon Feb  8 19:22:27 GMT 1999 Tony Gale  <gale@gtk.org>
 
        * example/colorsel/*: missing from the CVS for some reason

diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index fb80fcccd97782a5022b19be1bfe68802a1abace..ecaaf5108826d7a9a7520a89e0c767dd5fac6cb6 100644 (file)
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -5886,7 +5886,8 @@ draw_row (GtkCList     *clist,
     }
 
   /* draw focus rectangle */
-  if (clist->focus_row == row && GTK_WIDGET_HAS_FOCUS(widget))
+  if (clist->focus_row == row &&
+      GTK_WIDGET_CAN_FOCUS (widget) && GTK_WIDGET_HAS_FOCUS(widget))
     {
       if (!area)
        gdk_draw_rectangle (clist->clist_window, clist->xor_gc, FALSE,
@@ -6256,8 +6257,8 @@ hadjustment_value_changed (GtkAdjustment *adjustment,
          return;
        }
 
-      if (GTK_WIDGET_HAS_FOCUS(clist) && !GTK_CLIST_CHILD_HAS_FOCUS(clist) &&
-         GTK_CLIST_ADD_MODE(clist))
+      if (GTK_WIDGET_CAN_FOCUS(clist) && GTK_WIDGET_HAS_FOCUS(clist) &&
+         !GTK_CLIST_CHILD_HAS_FOCUS(clist) && GTK_CLIST_ADD_MODE(clist))
        {
          y = ROW_TOP_YPIXEL (clist, clist->focus_row);
              
@@ -6291,8 +6292,8 @@ hadjustment_value_changed (GtkAdjustment *adjustment,
          return;
        }
       
-      if (GTK_WIDGET_HAS_FOCUS(clist) && !GTK_CLIST_CHILD_HAS_FOCUS(clist) &&
-         GTK_CLIST_ADD_MODE(clist))
+      if (GTK_WIDGET_CAN_FOCUS(clist) && GTK_WIDGET_HAS_FOCUS(clist) &&
+         !GTK_CLIST_CHILD_HAS_FOCUS(clist) && GTK_CLIST_ADD_MODE(clist))
        {
          y = ROW_TOP_YPIXEL (clist, clist->focus_row);
          
@@ -6319,7 +6320,8 @@ hadjustment_value_changed (GtkAdjustment *adjustment,
 
   check_exposures (clist);
 
-  if (GTK_WIDGET_HAS_FOCUS(clist) && !GTK_CLIST_CHILD_HAS_FOCUS(clist))
+  if (GTK_WIDGET_CAN_FOCUS(clist) && GTK_WIDGET_HAS_FOCUS(clist) &&
+      !GTK_CLIST_CHILD_HAS_FOCUS(clist))
     {
       if (GTK_CLIST_ADD_MODE(clist))
        {
@@ -6618,7 +6620,7 @@ gtk_clist_draw_focus (GtkWidget *widget)
   g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_CLIST (widget));
 
-  if (!GTK_WIDGET_DRAWABLE (widget))
+  if (!GTK_WIDGET_DRAWABLE (widget) || !GTK_WIDGET_CAN_FOCUS (widget))
     return;
 
   clist = GTK_CLIST (widget);

diff --git a/gtk/gtkctree.c b/gtk/gtkctree.c
index bcc464f8403db8f85544f7f449ed90ad259c09d9..e97893d2b0de363a864578b642250802b228a78a 100644 (file)
--- a/gtk/gtkctree.c
+++ b/gtk/gtkctree.c
@@ -32,7 +32,7 @@
 #define PM_SIZE                    8
 #define TAB_SIZE                   (PM_SIZE + 6)
 #define CELL_SPACING               1
-#define CLIST_OPTIMUM_SIZE         512
+#define CLIST_OPTIMUM_SIZE         64
 #define COLUMN_INSET               3
 #define DRAG_WIDTH                 6
 
@@ -1956,7 +1956,8 @@ draw_row (GtkCList     *clist,
     }
 
   /* draw focus rectangle */
-  if (clist->focus_row == row && GTK_WIDGET_HAS_FOCUS (widget))
+  if (clist->focus_row == row &&
+      GTK_WIDGET_CAN_FOCUS (widget) && GTK_WIDGET_HAS_FOCUS (widget))
     {
       if (!area)
        gdk_draw_rectangle (clist->clist_window, clist->xor_gc, FALSE,