AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

GtkNotebook: replace group by group_name

Browse Source 
Dealing with bare pointers is problematic for language bindings,
using interned strings is much more straightforward and more than
good enough for what is needed here.

http://bugzilla.gnome.org/show_bug.cgi?id=630521
This commit is contained in:
Matthias Clasen 2010-09-24 11:13:30 -04:00
parent b47b1428b8
commit 3c19eea34b
5 changed files with 57 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/reference/gtk/gtk3-sections.txt
View File

@ -2222,8 +2222,8 @@ gtk_notebook_get_tab_detachable
gtk_notebook_get_tab_hborder
gtk_notebook_get_tab_vborder
gtk_notebook_set_current_page
gtk_notebook_set_group
gtk_notebook_get_group
gtk_notebook_set_group_name
gtk_notebook_get_group_name
gtk_notebook_set_action_widget
gtk_notebook_get_action_widget
<SUBSECTION Standard>

4
gtk/gtk.symbols
View File

@ -2066,8 +2066,8 @@ gtk_notebook_set_tab_label_text
gtk_notebook_set_tab_pos
gtk_notebook_get_tab_hborder
gtk_notebook_get_tab_vborder
gtk_notebook_get_group
gtk_notebook_set_group
gtk_notebook_get_group_name
gtk_notebook_set_group_name
gtk_notebook_get_tab_reorderable
gtk_notebook_set_tab_reorderable
gtk_notebook_get_tab_detachable

83
gtk/gtknotebook.c
View File

@ -94,7 +94,7 @@ struct _GtkNotebookPrivate
gint mouse_y;
gint pressed_button;
gpointer group;
GQuark group;
guint dnd_timer;
guint switch_tab_timer;
@ -173,7 +173,7 @@ enum {
PROP_SCROLLABLE,
PROP_PAGE,
PROP_ENABLE_POPUP,
PROP_GROUP,
PROP_GROUP_NAME
};
enum {
@ -639,17 +639,16 @@ gtk_notebook_class_init (GtkNotebookClass *class)
GTK_PARAM_READWRITE));
/**
* GtkNotebook:group:
* GtkNotebook:group-name:
*
* Group for tabs drag and drop.
*
* Since: 2.12
* Group name for tab drag and drop.
*/
g_object_class_install_property (gobject_class,
PROP_GROUP,
g_param_spec_pointer ("group",
P_("Group"),
P_("Group for tabs drag and drop"),
PROP_GROUP_NAME,
g_param_spec_string ("group-name",
P_("Group Name"),
P_("Group name for tab drag and drop"),
NULL,
GTK_PARAM_READWRITE));
gtk_container_class_install_child_property (container_class,
@ -1073,7 +1072,7 @@ gtk_notebook_init (GtkNotebook *notebook)
priv->has_after_previous = 0;
priv->has_after_next = 1;
priv->group = NULL;
priv->group = 0;
priv->pressed_button = -1;
priv->dnd_timer = 0;
priv->switch_tab_timer = 0;
@ -1517,8 +1516,8 @@ gtk_notebook_set_property (GObject *object,
case PROP_TAB_POS:
gtk_notebook_set_tab_pos (notebook, g_value_get_enum (value));
break;
case PROP_GROUP:
gtk_notebook_set_group (notebook, g_value_get_pointer (value));
case PROP_GROUP_NAME:
gtk_notebook_set_group_name (notebook, g_value_get_string (value));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -1555,8 +1554,8 @@ gtk_notebook_get_property (GObject *object,
case PROP_TAB_POS:
g_value_set_enum (value, priv->tab_pos);
break;
case PROP_GROUP:
g_value_set_pointer (value, priv->group);
case PROP_GROUP_NAME:
g_value_set_string (value, gtk_notebook_get_group_name (notebook));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -3451,19 +3450,19 @@ gtk_notebook_drag_motion (GtkWidget *widget,
if (target == tab_target)
{
gpointer widget_group, source_widget_group;
GtkWidget *source_widget;
GQuark group, source_group;
GtkNotebook *source;
GtkWidget *source_child;
source_widget = gtk_drag_get_source_widget (context);
g_assert (source_widget);
source = GTK_NOTEBOOK (gtk_drag_get_source_widget (context));
source_child = source->priv->cur_page->child;
widget_group = gtk_notebook_get_group (notebook);
source_widget_group = gtk_notebook_get_group (GTK_NOTEBOOK (source_widget));
group = notebook->priv->group;
source_group = source->priv->group;
if (widget_group && source_widget_group &&
widget_group == source_widget_group &&
!(widget == GTK_NOTEBOOK (source_widget)->priv->cur_page->child ||
gtk_widget_is_ancestor (widget, GTK_NOTEBOOK (source_widget)->priv->cur_page->child)))
if (group != 0 && group == source_group &&
!(widget == source_child ||
gtk_widget_is_ancestor (widget, source_child)))
{
gdk_drag_status (context, GDK_ACTION_MOVE, time);
return TRUE;
@ -7585,51 +7584,53 @@ gtk_notebook_reorder_child (GtkNotebook *notebook,
}
/**
* gtk_notebook_set_group:
* gtk_notebook_set_group_name:
* @notebook: a #GtkNotebook
* @group: (allow-none): a pointer to identify the notebook group, or %NULL to unset it
* @name: (allow-none): the name of the notebook group, or %NULL to unset it
*
* Sets a group identificator pointer for @notebook, notebooks sharing
* the same group identificator pointer will be able to exchange tabs
* via drag and drop. A notebook with a %NULL group identificator will
* Sets a group name for @notebook.
*
* Notebooks with the same name will be able to exchange tabs
* via drag and drop. A notebook with a %NULL group name will
* not be able to exchange tabs with any other notebook.
*
* Since: 2.12
*/
void
gtk_notebook_set_group (GtkNotebook *notebook,
gpointer group)
gtk_notebook_set_group_name (GtkNotebook *notebook,
const gchar *group_name)
{
GtkNotebookPrivate *priv;
GQuark *group;
g_return_if_fail (GTK_IS_NOTEBOOK (notebook));
priv = notebook->priv;
group = g_quark_from_string (group_name);
if (priv->group != group)
{
priv->group = group;
g_object_notify (G_OBJECT (notebook), "group");
g_object_notify (G_OBJECT (notebook), "group-name");
}
}
/**
* gtk_notebook_get_group:
* gtk_notebook_get_group_name:
* @notebook: a #GtkNotebook
*
* Gets the current group identificator pointer for @notebook.
* Gets the current group name for @notebook.
*
* Return Value: (transfer none): the group identificator,
* Return Value: (transfer none): the group name,
* or %NULL if none is set.
*
* Since: 2.12
**/
gpointer
gtk_notebook_get_group (GtkNotebook *notebook)
const gchar *
gtk_notebook_get_group_name (GtkNotebook *notebook)
{
g_return_val_if_fail (GTK_IS_NOTEBOOK (notebook), NULL);
return notebook->priv->group;
return g_quark_to_string (notebook->priv->group);
}
/**

6
gtk/gtknotebook.h
View File

@ -136,9 +136,9 @@ void gtk_notebook_remove_page (GtkNotebook *notebook,
* Tabs drag and drop *
***********************************************************/
void gtk_notebook_set_group (GtkNotebook *notebook,
gpointer group);
gpointer gtk_notebook_get_group (GtkNotebook *notebook);
void gtk_notebook_set_group_name (GtkNotebook *notebook,
const gchar *group_name);
const gchar *gtk_notebook_get_group_name (GtkNotebook *notebook);

12
tests/testnotebookdnd.c
View File

@ -79,8 +79,8 @@ window_creation_function (GtkNotebook *source_notebook,
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
notebook = gtk_notebook_new ();
gtk_notebook_set_group (GTK_NOTEBOOK (notebook),
gtk_notebook_get_group (source_notebook));
gtk_notebook_set_group_name (GTK_NOTEBOOK (notebook),
gtk_notebook_get_group_name (source_notebook));
gtk_container_add (GTK_CONTAINER (window), notebook);
@ -142,7 +142,7 @@ on_button_drag_data_received (GtkWidget *widget,
static GtkWidget*
create_notebook (gchar **labels,
gpointer group,
const gchar *group,
gint packing,
GtkPositionType pos)
{
@ -154,7 +154,7 @@ create_notebook (gchar **labels,
gtk_notebook_set_tab_pos (GTK_NOTEBOOK (notebook), pos);
gtk_notebook_set_scrollable (GTK_NOTEBOOK (notebook), TRUE);
gtk_container_set_border_width (GTK_CONTAINER (notebook), 6);
gtk_notebook_set_group (GTK_NOTEBOOK (notebook), group);
gtk_notebook_set_group_name (GTK_NOTEBOOK (notebook), group);
while (*labels)
{
@ -184,7 +184,7 @@ create_notebook (gchar **labels,
static GtkWidget*
create_notebook_with_notebooks (gchar **labels,
gpointer group,
const gchar *group,
gint packing,
GtkPositionType pos)
{
@ -196,7 +196,7 @@ create_notebook_with_notebooks (gchar **labels,
gtk_notebook_set_tab_pos (GTK_NOTEBOOK (notebook), pos);
gtk_notebook_set_scrollable (GTK_NOTEBOOK (notebook), TRUE);
gtk_container_set_border_width (GTK_CONTAINER (notebook), 6);
gtk_notebook_set_group (GTK_NOTEBOOK (notebook), group);
gtk_notebook_set_group_name (GTK_NOTEBOOK (notebook), group);
while (*labels)
{