From 32b008bf5669a9c5007df2a4ea63c69698d155e8 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Sat, 20 Feb 1999 19:09:21 +0000 Subject: [PATCH] increment years and months by two not three on double clicks, patch Sat Feb 20 20:04:48 1999 Tim Janik * gtk/gtkcalendar.c (gtk_calendar_button_press): increment years and months by two not three on double clicks, patch provided by Nick Lamb . --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkcalendar.c | 9 ++++++--- 8 files changed, 48 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c520576ef2..c1753ae735 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Feb 20 20:04:48 1999 Tim Janik + + * gtk/gtkcalendar.c (gtk_calendar_button_press): increment years and + months by two not three on double clicks, patch provided by Nick Lamb + . + Sat Feb 20 19:44:36 1999 Tim Janik * gtk/gtkwindow.c: added ::modal argument. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index c520576ef2..c1753ae735 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Sat Feb 20 20:04:48 1999 Tim Janik + + * gtk/gtkcalendar.c (gtk_calendar_button_press): increment years and + months by two not three on double clicks, patch provided by Nick Lamb + . + Sat Feb 20 19:44:36 1999 Tim Janik * gtk/gtkwindow.c: added ::modal argument. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c520576ef2..c1753ae735 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Sat Feb 20 20:04:48 1999 Tim Janik + + * gtk/gtkcalendar.c (gtk_calendar_button_press): increment years and + months by two not three on double clicks, patch provided by Nick Lamb + . + Sat Feb 20 19:44:36 1999 Tim Janik * gtk/gtkwindow.c: added ::modal argument. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index c520576ef2..c1753ae735 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Sat Feb 20 20:04:48 1999 Tim Janik + + * gtk/gtkcalendar.c (gtk_calendar_button_press): increment years and + months by two not three on double clicks, patch provided by Nick Lamb + . + Sat Feb 20 19:44:36 1999 Tim Janik * gtk/gtkwindow.c: added ::modal argument. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index c520576ef2..c1753ae735 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Sat Feb 20 20:04:48 1999 Tim Janik + + * gtk/gtkcalendar.c (gtk_calendar_button_press): increment years and + months by two not three on double clicks, patch provided by Nick Lamb + . + Sat Feb 20 19:44:36 1999 Tim Janik * gtk/gtkwindow.c: added ::modal argument. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c520576ef2..c1753ae735 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Sat Feb 20 20:04:48 1999 Tim Janik + + * gtk/gtkcalendar.c (gtk_calendar_button_press): increment years and + months by two not three on double clicks, patch provided by Nick Lamb + . + Sat Feb 20 19:44:36 1999 Tim Janik * gtk/gtkwindow.c: added ::modal argument. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c520576ef2..c1753ae735 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Sat Feb 20 20:04:48 1999 Tim Janik + + * gtk/gtkcalendar.c (gtk_calendar_button_press): increment years and + months by two not three on double clicks, patch provided by Nick Lamb + . + Sat Feb 20 19:44:36 1999 Tim Janik * gtk/gtkwindow.c: added ::modal argument. diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c index f3d081b23a..db07340a47 100644 --- a/gtk/gtkcalendar.c +++ b/gtk/gtkcalendar.c @@ -2289,6 +2289,12 @@ gtk_calendar_button_press (GtkWidget *widget, x = (gint) (event->x); y = (gint) (event->y); + if (event->window == private_data->main_win) + gtk_calendar_main_button (widget, event); + + if (event->type != GDK_BUTTON_PRESS) + return FALSE; /* Double-clicks? Triple-clicks? No thanks! */ + if (event->window == private_data->arrow_win[ARROW_MONTH_LEFT]) gtk_calendar_set_month_prev (calendar); @@ -2301,9 +2307,6 @@ gtk_calendar_button_press (GtkWidget *widget, if (event->window == private_data->arrow_win[ARROW_YEAR_RIGHT]) gtk_calendar_set_year_next (calendar); - if (event->window == private_data->main_win) - gtk_calendar_main_button (widget, event); - return FALSE; }