From ecc1ceee3c303a11fb53ea753e9782ac94189e4e Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 22 Sep 2004 20:39:56 +0000 Subject: [PATCH] Remove unnecessary g_return_if_fail()s from virtual functions. (#153469, 2004-09-22 Matthias Clasen * gtk/gtkrange.c (gtk_range_map, gtk_range_unmap): * gtk/gtkbutton.c (gtk_button_map, gtk_button_unmap): Remove unnecessary g_return_if_fail()s from virtual functions. (#153469, (Tristan Van Berkom) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkbutton.c | 4 ---- gtk/gtkrange.c | 4 ---- 6 files changed, 20 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 83a270814e..6af83c1a59 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2004-09-22 Matthias Clasen + * gtk/gtkrange.c (gtk_range_map, gtk_range_unmap): + * gtk/gtkbutton.c (gtk_button_map, gtk_button_unmap): Remove + unnecessary g_return_if_fail()s from virtual functions. (#153469, + (Tristan Van Berkom) + * gtk/gtkaboutdialog.c (gtk_about_dialog_finalize): Don't leak cursors. (#153468, Christian Persch) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 83a270814e..6af83c1a59 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,10 @@ 2004-09-22 Matthias Clasen + * gtk/gtkrange.c (gtk_range_map, gtk_range_unmap): + * gtk/gtkbutton.c (gtk_button_map, gtk_button_unmap): Remove + unnecessary g_return_if_fail()s from virtual functions. (#153469, + (Tristan Van Berkom) + * gtk/gtkaboutdialog.c (gtk_about_dialog_finalize): Don't leak cursors. (#153468, Christian Persch) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 83a270814e..6af83c1a59 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,10 @@ 2004-09-22 Matthias Clasen + * gtk/gtkrange.c (gtk_range_map, gtk_range_unmap): + * gtk/gtkbutton.c (gtk_button_map, gtk_button_unmap): Remove + unnecessary g_return_if_fail()s from virtual functions. (#153469, + (Tristan Van Berkom) + * gtk/gtkaboutdialog.c (gtk_about_dialog_finalize): Don't leak cursors. (#153468, Christian Persch) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 83a270814e..6af83c1a59 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,10 @@ 2004-09-22 Matthias Clasen + * gtk/gtkrange.c (gtk_range_map, gtk_range_unmap): + * gtk/gtkbutton.c (gtk_button_map, gtk_button_unmap): Remove + unnecessary g_return_if_fail()s from virtual functions. (#153469, + (Tristan Van Berkom) + * gtk/gtkaboutdialog.c (gtk_about_dialog_finalize): Don't leak cursors. (#153468, Christian Persch) diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c index bcce751349..9e250d748f 100644 --- a/gtk/gtkbutton.c +++ b/gtk/gtkbutton.c @@ -834,8 +834,6 @@ gtk_button_map (GtkWidget *widget) { GtkButton *button = GTK_BUTTON (widget); - g_return_if_fail (GTK_IS_BUTTON (widget)); - GTK_WIDGET_CLASS (parent_class)->map (widget); if (button->event_window) @@ -847,8 +845,6 @@ gtk_button_unmap (GtkWidget *widget) { GtkButton *button = GTK_BUTTON (widget); - g_return_if_fail (GTK_IS_BUTTON (widget)); - if (button->event_window) gdk_window_hide (button->event_window); diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c index ad32d1191a..fe0b7ab711 100644 --- a/gtk/gtkrange.c +++ b/gtk/gtkrange.c @@ -880,8 +880,6 @@ gtk_range_map (GtkWidget *widget) { GtkRange *range = GTK_RANGE (widget); - g_return_if_fail (GTK_IS_RANGE (widget)); - gdk_window_show (range->event_window); GTK_WIDGET_CLASS (parent_class)->map (widget); @@ -892,8 +890,6 @@ gtk_range_unmap (GtkWidget *widget) { GtkRange *range = GTK_RANGE (widget); - g_return_if_fail (GTK_IS_RANGE (widget)); - gdk_window_hide (range->event_window); GTK_WIDGET_CLASS (parent_class)->unmap (widget);