[gtk+] Fixups to GtkStack
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Fixups to GtkStack
- Date: Thu, 26 Sep 2013 03:54:58 +0000 (UTC)
commit 7439e03f3d22e470ba6a774fdd2dd884d4bcd339
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Sep 25 23:52:39 2013 -0400
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.
gtk/gtkstack.h | 2 +-
gtk/gtkstackswitcher.c | 5 ++++-
gtk/gtkstackswitcher.h | 3 ++-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/gtk/gtkstack.h b/gtk/gtkstack.h
index 2c967aa..82e527c 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 0aa6204..8f68339 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 402b837..093f85f 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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]