[gtk+/wip/matthiasc/tab-strip] Remove custom tab support for now
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/matthiasc/tab-strip] Remove custom tab support for now
- Date: Tue, 31 May 2016 12:48:51 +0000 (UTC)
commit 397332702ea152b1b586b7d86618eb3acfd043a1
Author: Matthias Clasen <mclasen redhat com>
Date: Tue May 31 00:18:52 2016 -0400
Remove custom tab support for now
Allowing custom tab implementations ties our hands for what we can
do with the tabs, so lets figure out the desired user experience first.
gtk/gtktabstrip.c | 37 +++----------------------------------
gtk/gtktabstrip.h | 3 ---
2 files changed, 3 insertions(+), 37 deletions(-)
---
diff --git a/gtk/gtktabstrip.c b/gtk/gtktabstrip.c
index cfcbfed..3506f3b 100644
--- a/gtk/gtktabstrip.c
+++ b/gtk/gtktabstrip.c
@@ -67,13 +67,6 @@ enum {
static GParamSpec *properties[N_PROPS];
-enum {
- CREATE_TAB,
- LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL];
-
static void
gtk_tab_strip_add (GtkContainer *container,
GtkWidget *widget)
@@ -306,9 +299,6 @@ gtk_tab_strip_finalize (GObject *object)
G_OBJECT_CLASS (gtk_tab_strip_parent_class)->finalize (object);
}
-static GtkTab *gtk_tab_strip_real_create_tab (GtkTabStrip *self,
- GtkWidget *widget);
-
static void
gtk_tab_strip_class_init (GtkTabStripClass *klass)
{
@@ -334,18 +324,6 @@ gtk_tab_strip_class_init (GtkTabStripClass *klass)
container_class->forall = gtk_tab_strip_forall;
container_class->child_type = gtk_tab_strip_child_type;
- klass->create_tab = gtk_tab_strip_real_create_tab;
-
- signals[CREATE_TAB] =
- g_signal_new (I_("create-tab"),
- G_TYPE_FROM_CLASS (object_class),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GtkTabStripClass, create_tab),
- gtk_object_handled_accumulator, NULL,
- NULL,
- GTK_TYPE_TAB, 1,
- GTK_TYPE_WIDGET);
-
properties[PROP_STACK] =
g_param_spec_object ("stack", P_("Stack"), P_("The stack of items to manage"),
GTK_TYPE_STACK,
@@ -740,17 +718,6 @@ tab_activated (GtkTab *tab,
gtk_stack_set_visible_child (priv->stack, widget);
}
-static GtkTab *
-gtk_tab_strip_real_create_tab (GtkTabStrip *self,
- GtkWidget *widget)
-{
- GtkTabStripPrivate *priv = gtk_tab_strip_get_instance_private (self);
-
- return g_object_new (priv->closable ? GTK_TYPE_CLOSABLE_TAB : GTK_TYPE_SIMPLE_TAB,
- "widget", widget,
- NULL);
-}
-
static void
gtk_tab_strip_stack_add (GtkTabStrip *self,
GtkWidget *widget,
@@ -764,7 +731,9 @@ gtk_tab_strip_stack_add (GtkTabStrip *self,
"position", &position,
NULL);
- g_signal_emit (self, signals[CREATE_TAB], 0, widget, &tab);
+ tab = g_object_new (priv->closable ? GTK_TYPE_CLOSABLE_TAB : GTK_TYPE_SIMPLE_TAB,
+ "widget", widget,
+ NULL);
g_object_set_data (G_OBJECT (widget), "GTK_TAB", tab);
diff --git a/gtk/gtktabstrip.h b/gtk/gtktabstrip.h
index 365ab51..1718f3e 100644
--- a/gtk/gtktabstrip.h
+++ b/gtk/gtktabstrip.h
@@ -49,9 +49,6 @@ struct _GtkTabStripClass
{
GtkContainerClass parent_class;
- GtkTab * (* create_tab) (GtkTabStrip *self,
- GtkWidget *child);
-
/* Padding for future expansion */
void (*_gtk_reserved1) (void);
void (*_gtk_reserved2) (void);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]