diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index b7b0b5edc6..df308b0f87 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -6072,9 +6072,9 @@ gtk_widget_set_app_paintable (GtkWidget *widget,
   if (gtk_widget_get_app_paintable (widget) != app_paintable)
     {
       if (app_paintable)
-	GTK_WIDGET_SET_FLAGS (widget, GTK_APP_PAINTABLE);
+        GTK_OBJECT_FLAGS (widget) |= GTK_APP_PAINTABLE;
       else
-	GTK_WIDGET_UNSET_FLAGS (widget, GTK_APP_PAINTABLE);
+        GTK_OBJECT_FLAGS (widget) &= ~(GTK_APP_PAINTABLE);
 
       if (gtk_widget_is_drawable (widget))
 	gtk_widget_queue_draw (widget);