stylecontext: Do invalidation on first resize container

[~andy/gtk] / gtk / gtkbuttonprivate.h

diff --git a/gtk/gtkbuttonprivate.h b/gtk/gtkbuttonprivate.h
index 22d6b3df63161ecc46ea9487869b385f461b849b..ea44b71266c7eb72ed0dbf09612237d2fd9195f2 100644 (file)
--- a/gtk/gtkbuttonprivate.h
+++ b/gtk/gtkbuttonprivate.h
@@ -19,7 +19,7 @@
 #ifndef __GTK_BUTTON_PRIVATE_H__
 #define __GTK_BUTTON_PRIVATE_H__
 
-#include "gsimpleactionobserver.h"
+#include "gtkactionhelper.h"
 #include "gtkaction.h"
 
 G_BEGIN_DECLS
@@ -29,10 +29,7 @@ struct _GtkButtonPrivate
 {
   GtkAction             *action;
   GtkWidget             *image;
-
-  gchar                 *action_name;
-  GVariant              *action_target;
-  GSimpleActionObserver *action_observer;
+  GtkActionHelper       *action_helper;
 
   GdkDevice             *grab_keyboard;
   GdkWindow             *event_window;
@@ -59,6 +56,7 @@ struct _GtkButtonPrivate
   guint          use_action_appearance : 1;
   guint          use_stock             : 1;
   guint          use_underline         : 1;
+  guint          always_show_image     : 1;
 };
 
 void _gtk_button_set_depressed             (GtkButton          *button,