From b43de0cbdaebc1f4378d02a577d8f580c5ec24bf Mon Sep 17 00:00:00 2001 From: Lars Hamann Date: Mon, 8 Feb 1999 21:03:54 +0000 Subject: [PATCH] changed to 64 (gtk_clist_draw_focus) (hadjustment_value_changed) Mon Feb 8 21:00:20 1999 Lars Hamann * 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. --- ChangeLog | 9 +++++++++ ChangeLog.pre-2-0 | 9 +++++++++ ChangeLog.pre-2-10 | 9 +++++++++ ChangeLog.pre-2-2 | 9 +++++++++ ChangeLog.pre-2-4 | 9 +++++++++ ChangeLog.pre-2-6 | 9 +++++++++ ChangeLog.pre-2-8 | 9 +++++++++ gtk/gtkclist.c | 16 +++++++++------- gtk/gtkctree.c | 5 +++-- 9 files changed, 75 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 39968de55c..775ea8309c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Mon Feb 8 21:00:20 1999 Lars Hamann + + * 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 * example/colorsel/*: missing from the CVS for some reason diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 39968de55c..775ea8309c 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,12 @@ +Mon Feb 8 21:00:20 1999 Lars Hamann + + * 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 * example/colorsel/*: missing from the CVS for some reason diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 39968de55c..775ea8309c 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +Mon Feb 8 21:00:20 1999 Lars Hamann + + * 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 * example/colorsel/*: missing from the CVS for some reason diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 39968de55c..775ea8309c 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,12 @@ +Mon Feb 8 21:00:20 1999 Lars Hamann + + * 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 * example/colorsel/*: missing from the CVS for some reason diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 39968de55c..775ea8309c 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +Mon Feb 8 21:00:20 1999 Lars Hamann + + * 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 * example/colorsel/*: missing from the CVS for some reason diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 39968de55c..775ea8309c 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +Mon Feb 8 21:00:20 1999 Lars Hamann + + * 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 * example/colorsel/*: missing from the CVS for some reason diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 39968de55c..775ea8309c 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +Mon Feb 8 21:00:20 1999 Lars Hamann + + * 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 * example/colorsel/*: missing from the CVS for some reason diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c index fb80fcccd9..ecaaf51088 100644 --- 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 bcc464f840..e97893d2b0 100644 --- 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,