diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2013-09-25 23:52:39 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2013-09-25 23:54:31 -0400 |
| commit | 7439e03f3d22e470ba6a774fdd2dd884d4bcd339 (patch) | |
| tree | eeae0820c35f4705a47304e22ba5ec7ecf395437 | |
| parent | 5315661721137c1f195fa88c2bf12f1a3e32ecfa (diff) | |
| download | gtk+-7439e03f3d22e470ba6a774fdd2dd884d4bcd339.tar.gz | |
Fixups to GtkStack
The GtkStack and GtkStackSwitcher code did not really
follow GTK+ conventions for includes. Fix that, and also
fix up a case of gpointer vs gpointer* confusion
in gtkstack.c.
| -rw-r--r-- | gtk/gtkstack.h | 2 | ||||
| -rw-r--r-- | gtk/gtkstackswitcher.c | 5 | ||||
| -rw-r--r-- | gtk/gtkstackswitcher.h | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/gtk/gtkstack.h b/gtk/gtkstack.h index 2c967aa67b..82e527c459 100644 --- a/gtk/gtkstack.h +++ b/gtk/gtkstack.h @@ -22,7 +22,7 @@ #ifndef __GTK_STACK_H__ #define __GTK_STACK_H__ -#include <gtk/gtk.h> +#include <gtk/gtkcontainer.h> G_BEGIN_DECLS diff --git a/gtk/gtkstackswitcher.c b/gtk/gtkstackswitcher.c index 0aa6204f84..8f683397cd 100644 --- a/gtk/gtkstackswitcher.c +++ b/gtk/gtkstackswitcher.c @@ -19,6 +19,9 @@ #include "config.h" #include "gtkstackswitcher.h" +#include "gtkradiobutton.h" +#include "gtklabel.h" +#include "gtkorientable.h" #include "gtkprivate.h" #include "gtkintl.h" @@ -140,7 +143,7 @@ rebuild_child (GtkWidget *self, } static void -update_needs_attention (GtkWidget *widget, GtkWidget *button, gpointer *data) +update_needs_attention (GtkWidget *widget, GtkWidget *button, gpointer data) { GtkContainer *container; gboolean needs_attention; diff --git a/gtk/gtkstackswitcher.h b/gtk/gtkstackswitcher.h index 402b83778c..093f85f0fb 100644 --- a/gtk/gtkstackswitcher.h +++ b/gtk/gtkstackswitcher.h @@ -20,7 +20,8 @@ #ifndef __GTK_STACK_SWITCHER_H__ #define __GTK_STACK_SWITCHER_H__ -#include "gtkstack.h" +#include <gtk/gtkbox.h> +#include <gtk/gtkstack.h> G_BEGIN_DECLS |