callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove left-over NULL checks that were preventing the NULL to "unmodify"

Browse Source 
Sun Dec  8 18:28:51 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkwidget.c (gtk_widget_modify_fg/bg/base/text/font):
        Remove left-over NULL checks that were preventing the
        NULL to "unmodify" feature from actually working.
This commit is contained in:
Owen Taylor 2002-12-08 23:32:29 +00:00 committed by Owen Taylor
parent 3bdc520c48
commit 7bd2340794
7 changed files with 42 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Sun Dec 8 18:28:51 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_modify_fg/bg/base/text/font):
Remove left-over NULL checks that were preventing the
NULL to "unmodify" feature from actually working.
(#100702, Jon-Kare Hellan)
2002-12-08 Matthias Clasen <maclas@gmx.de> 2002-12-08 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcolorsel.c (gtk_color_selection_set_previous_color): * gtk/gtkcolorsel.c (gtk_color_selection_set_previous_color):

7
ChangeLog.pre-2-10
View File

@ -1,3 +1,10 @@
Sun Dec 8 18:28:51 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_modify_fg/bg/base/text/font):
Remove left-over NULL checks that were preventing the
NULL to "unmodify" feature from actually working.
(#100702, Jon-Kare Hellan)
2002-12-08 Matthias Clasen <maclas@gmx.de> 2002-12-08 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcolorsel.c (gtk_color_selection_set_previous_color): * gtk/gtkcolorsel.c (gtk_color_selection_set_previous_color):

7
ChangeLog.pre-2-2
View File

@ -1,3 +1,10 @@
Sun Dec 8 18:28:51 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_modify_fg/bg/base/text/font):
Remove left-over NULL checks that were preventing the
NULL to "unmodify" feature from actually working.
(#100702, Jon-Kare Hellan)
2002-12-08 Matthias Clasen <maclas@gmx.de> 2002-12-08 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcolorsel.c (gtk_color_selection_set_previous_color): * gtk/gtkcolorsel.c (gtk_color_selection_set_previous_color):

7
ChangeLog.pre-2-4
View File

@ -1,3 +1,10 @@
Sun Dec 8 18:28:51 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_modify_fg/bg/base/text/font):
Remove left-over NULL checks that were preventing the
NULL to "unmodify" feature from actually working.
(#100702, Jon-Kare Hellan)
2002-12-08 Matthias Clasen <maclas@gmx.de> 2002-12-08 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcolorsel.c (gtk_color_selection_set_previous_color): * gtk/gtkcolorsel.c (gtk_color_selection_set_previous_color):

7
ChangeLog.pre-2-6
View File

@ -1,3 +1,10 @@
Sun Dec 8 18:28:51 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_modify_fg/bg/base/text/font):
Remove left-over NULL checks that were preventing the
NULL to "unmodify" feature from actually working.
(#100702, Jon-Kare Hellan)
2002-12-08 Matthias Clasen <maclas@gmx.de> 2002-12-08 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcolorsel.c (gtk_color_selection_set_previous_color): * gtk/gtkcolorsel.c (gtk_color_selection_set_previous_color):

7
ChangeLog.pre-2-8
View File

@ -1,3 +1,10 @@
Sun Dec 8 18:28:51 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_modify_fg/bg/base/text/font):
Remove left-over NULL checks that were preventing the
NULL to "unmodify" feature from actually working.
(#100702, Jon-Kare Hellan)
2002-12-08 Matthias Clasen <maclas@gmx.de> 2002-12-08 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcolorsel.c (gtk_color_selection_set_previous_color): * gtk/gtkcolorsel.c (gtk_color_selection_set_previous_color):

5
gtk/gtkwidget.c
View File

@ -4099,7 +4099,6 @@ gtk_widget_modify_fg (GtkWidget *widget,
{ {
g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (state >= GTK_STATE_NORMAL && state <= GTK_STATE_INSENSITIVE); g_return_if_fail (state >= GTK_STATE_NORMAL && state <= GTK_STATE_INSENSITIVE);
g_return_if_fail (color != NULL);
gtk_widget_modify_color_component (widget, GTK_RC_FG, state, color); gtk_widget_modify_color_component (widget, GTK_RC_FG, state, color);
} }
@ -4123,7 +4122,6 @@ gtk_widget_modify_bg (GtkWidget *widget,
{ {
g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (state >= GTK_STATE_NORMAL && state <= GTK_STATE_INSENSITIVE); g_return_if_fail (state >= GTK_STATE_NORMAL && state <= GTK_STATE_INSENSITIVE);
g_return_if_fail (color != NULL);
gtk_widget_modify_color_component (widget, GTK_RC_BG, state, color); gtk_widget_modify_color_component (widget, GTK_RC_BG, state, color);
} }
@ -4149,7 +4147,6 @@ gtk_widget_modify_text (GtkWidget *widget,
{ {
g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (state >= GTK_STATE_NORMAL && state <= GTK_STATE_INSENSITIVE); g_return_if_fail (state >= GTK_STATE_NORMAL && state <= GTK_STATE_INSENSITIVE);
g_return_if_fail (color != NULL);
gtk_widget_modify_color_component (widget, GTK_RC_TEXT, state, color); gtk_widget_modify_color_component (widget, GTK_RC_TEXT, state, color);
} }
@ -4175,7 +4172,6 @@ gtk_widget_modify_base (GtkWidget *widget,
{ {
g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (state >= GTK_STATE_NORMAL && state <= GTK_STATE_INSENSITIVE); g_return_if_fail (state >= GTK_STATE_NORMAL && state <= GTK_STATE_INSENSITIVE);
g_return_if_fail (color != NULL);
gtk_widget_modify_color_component (widget, GTK_RC_BASE, state, color); gtk_widget_modify_color_component (widget, GTK_RC_BASE, state, color);
} }
@ -4196,7 +4192,6 @@ gtk_widget_modify_font (GtkWidget *widget,
GtkRcStyle *rc_style; GtkRcStyle *rc_style;
g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (font_desc != NULL);
rc_style = gtk_widget_get_modifier_style (widget); rc_style = gtk_widget_get_modifier_style (widget);