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

Remove gtktypeutils altogether

Browse Source 
Based on patches by Javier Jardón.

https://bugzilla.gnome.org/show_bug.cgi?id=629955
This commit is contained in:
Matthias Clasen 2011-01-04 14:51:19 -05:00
parent 1283368b1b
commit 98440ad031
51 changed files with 434 additions and 466 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/Makefile.am
View File

@ -333,7 +333,6 @@ gtk_public_h_sources = \
gtktreestore.h \ gtktreestore.h \
gtktreeview.h \ gtktreeview.h \
gtktreeviewcolumn.h \ gtktreeviewcolumn.h \
gtktypeutils.h \
gtkuimanager.h \ gtkuimanager.h \
gtkvbbox.h \ gtkvbbox.h \
gtkvbox.h \ gtkvbox.h \
@ -662,7 +661,6 @@ gtk_base_c_sources = \
gtktreeview.c \ gtktreeview.c \
gtktreeviewcolumn.c \ gtktreeviewcolumn.c \
gtktypebuiltins.c \ gtktypebuiltins.c \
gtktypeutils.c \
gtkuimanager.c \ gtkuimanager.c \
gtkvbbox.c \ gtkvbbox.c \
gtkvbox.c \ gtkvbox.c \

2
gtk/gtk.h
View File

@ -217,7 +217,7 @@
#include <gtk/gtktreestore.h> #include <gtk/gtktreestore.h>
#include <gtk/gtktreeview.h> #include <gtk/gtktreeview.h>
#include <gtk/gtktreeviewcolumn.h> #include <gtk/gtktreeviewcolumn.h>
#include <gtk/gtktypeutils.h> #include <gtk/gtktypebuiltins.h>
#include <gtk/gtkuimanager.h> #include <gtk/gtkuimanager.h>
#include <gtk/gtkvbbox.h> #include <gtk/gtkvbbox.h>
#include <gtk/gtkvbox.h> #include <gtk/gtkvbox.h>

1
gtk/gtkaboutdialog.c
View File

@ -54,6 +54,7 @@
#include "gtkmain.h" #include "gtkmain.h"
#include "gtkmessagedialog.h" #include "gtkmessagedialog.h"
#include "gtktogglebutton.h" #include "gtktogglebutton.h"
#include "gtktypebuiltins.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkintl.h" #include "gtkintl.h"

2
gtk/gtkactiongroup.h
View File

@ -36,7 +36,7 @@
#define __GTK_ACTION_GROUP_H__ #define __GTK_ACTION_GROUP_H__
#include <gtk/gtkaction.h> #include <gtk/gtkaction.h>
#include <gtk/gtktypeutils.h> /* for GtkTranslateFunc */ #include <gtk/gtkstock.h>
G_BEGIN_DECLS G_BEGIN_DECLS

2
gtk/gtkassistant.c
View File

@ -71,7 +71,7 @@
#include "gtksizegroup.h" #include "gtksizegroup.h"
#include "gtksizerequest.h" #include "gtksizerequest.h"
#include "gtkstock.h" #include "gtkstock.h"
#include "gtktypebuiltins.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkbuildable.h" #include "gtkbuildable.h"

647
gtk/gtkbindings.c
View File

@ -11,7 +11,7 @@
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
@ -32,14 +32,17 @@
#include <stdarg.h> #include <stdarg.h>
#include "gtkbindings.h" #include "gtkbindings.h"
#include "gtktypeutils.h"
#include "gtkkeyhash.h" #include "gtkkeyhash.h"
#include "gtkwidget.h" #include "gtkwidget.h"
#include "gtkrc.h" #include "gtkrc.h"
#include "gtkintl.h"
/* --- defines --- */ /* --- defines --- */
#define BINDING_MOD_MASK() (gtk_accelerator_get_default_mod_mask () | GDK_RELEASE_MASK) #define BINDING_MOD_MASK() (gtk_accelerator_get_default_mod_mask () | GDK_RELEASE_MASK)
#define GTK_TYPE_IDENTIFIER (gtk_identifier_get_type ())
GType gtk_identifier_get_type (void) G_GNUC_CONST;
/* --- structures --- */ /* --- structures --- */
@ -52,14 +55,28 @@ typedef struct {
/* --- variables --- */ /* --- variables --- */
static GHashTable *binding_entry_hash_table = NULL; static GHashTable *binding_entry_hash_table = NULL;
static GSList *binding_key_hashes = NULL; static GSList *binding_key_hashes = NULL;
static GSList *binding_set_list = NULL; static GSList *binding_set_list = NULL;
static const gchar key_class_binding_set[] = "gtk-class-binding-set"; static const gchar key_class_binding_set[] = "gtk-class-binding-set";
static GQuark key_id_class_binding_set = 0; static GQuark key_id_class_binding_set = 0;
/* --- functions --- */ /* --- functions --- */
GType
gtk_identifier_get_type (void)
{
static GType our_type = 0;
if (our_type == 0)
{
GTypeInfo tinfo = { 0, };
our_type = g_type_register_static (G_TYPE_STRING, I_("GtkIdentifier"), &tinfo, 0);
}
return our_type;
}
static void static void
pattern_spec_free (PatternSpec *pspec) pattern_spec_free (PatternSpec *pspec)
{ {
@ -70,7 +87,7 @@ pattern_spec_free (PatternSpec *pspec)
static GtkBindingSignal* static GtkBindingSignal*
binding_signal_new (const gchar *signal_name, binding_signal_new (const gchar *signal_name,
guint n_args) guint n_args)
{ {
GtkBindingSignal *signal; GtkBindingSignal *signal;
@ -91,7 +108,7 @@ binding_signal_free (GtkBindingSignal *sig)
for (i = 0; i < sig->n_args; i++) for (i = 0; i < sig->n_args; i++)
{ {
if (G_TYPE_FUNDAMENTAL (sig->args[i].arg_type) == G_TYPE_STRING) if (G_TYPE_FUNDAMENTAL (sig->args[i].arg_type) == G_TYPE_STRING)
g_free (sig->args[i].d.string_data); g_free (sig->args[i].d.string_data);
} }
g_slice_free1 (sizeof (GtkBindingSignal) + sig->n_args * sizeof (GtkBindingArg), sig); g_slice_free1 (sizeof (GtkBindingSignal) + sig->n_args * sizeof (GtkBindingArg), sig);
} }
@ -110,7 +127,7 @@ binding_entry_hash (gconstpointer key)
static gint static gint
binding_entries_compare (gconstpointer a, binding_entries_compare (gconstpointer a,
gconstpointer b) gconstpointer b)
{ {
register const GtkBindingEntry *ea = a; register const GtkBindingEntry *ea = a;
register const GtkBindingEntry *eb = b; register const GtkBindingEntry *eb = b;
@ -120,7 +137,7 @@ binding_entries_compare (gconstpointer a,
static void static void
binding_key_hash_insert_entry (GtkKeyHash *key_hash, binding_key_hash_insert_entry (GtkKeyHash *key_hash,
GtkBindingEntry *entry) GtkBindingEntry *entry)
{ {
guint keyval = entry->keyval; guint keyval = entry->keyval;
@ -130,9 +147,9 @@ binding_key_hash_insert_entry (GtkKeyHash *key_hash,
if (entry->modifiers & GDK_SHIFT_MASK) if (entry->modifiers & GDK_SHIFT_MASK)
{ {
if (keyval == GDK_KEY_Tab) if (keyval == GDK_KEY_Tab)
keyval = GDK_KEY_ISO_Left_Tab; keyval = GDK_KEY_ISO_Left_Tab;
else else
keyval = gdk_keyval_to_upper (keyval); keyval = gdk_keyval_to_upper (keyval);
} }
_gtk_key_hash_add_entry (key_hash, keyval, entry->modifiers & ~GDK_RELEASE_MASK, entry); _gtk_key_hash_add_entry (key_hash, keyval, entry->modifiers & ~GDK_RELEASE_MASK, entry);
@ -149,8 +166,8 @@ binding_key_hash_destroy (gpointer data)
static void static void
insert_entries_into_key_hash (gpointer key, insert_entries_into_key_hash (gpointer key,
gpointer value, gpointer value,
gpointer data) gpointer data)
{ {
GtkKeyHash *key_hash = data; GtkKeyHash *key_hash = data;
GtkBindingEntry *entry = value; GtkBindingEntry *entry = value;
@ -176,9 +193,9 @@ binding_key_hash_for_keymap (GdkKeymap *keymap)
g_object_set_qdata_full (G_OBJECT (keymap), key_hash_quark, key_hash, binding_key_hash_destroy); g_object_set_qdata_full (G_OBJECT (keymap), key_hash_quark, key_hash, binding_key_hash_destroy);
if (binding_entry_hash_table) if (binding_entry_hash_table)
g_hash_table_foreach (binding_entry_hash_table, g_hash_table_foreach (binding_entry_hash_table,
insert_entries_into_key_hash, insert_entries_into_key_hash,
key_hash); key_hash);
binding_key_hashes = g_slist_prepend (binding_key_hashes, key_hash); binding_key_hashes = g_slist_prepend (binding_key_hashes, key_hash);
} }
@ -189,8 +206,8 @@ binding_key_hash_for_keymap (GdkKeymap *keymap)
static GtkBindingEntry* static GtkBindingEntry*
binding_entry_new (GtkBindingSet *binding_set, binding_entry_new (GtkBindingSet *binding_set,
guint keyval, guint keyval,
GdkModifierType modifiers) GdkModifierType modifiers)
{ {
GSList *tmp_list; GSList *tmp_list;
GtkBindingEntry *entry; GtkBindingEntry *entry;
@ -230,9 +247,9 @@ binding_entry_free (GtkBindingEntry *entry)
GtkBindingSignal *sig; GtkBindingSignal *sig;
g_assert (entry->set_next == NULL && g_assert (entry->set_next == NULL &&
entry->hash_next == NULL && entry->hash_next == NULL &&
entry->in_emission == FALSE && entry->in_emission == FALSE &&
entry->destroyed == TRUE); entry->destroyed == TRUE);
entry->destroyed = FALSE; entry->destroyed = FALSE;
@ -264,13 +281,13 @@ binding_entry_destroy (GtkBindingEntry *entry)
while (tmp) while (tmp)
{ {
if (tmp == entry) if (tmp == entry)
{ {
if (last) if (last)
last->set_next = entry->set_next; last->set_next = entry->set_next;
else else
entry->binding_set->entries = entry->set_next; entry->binding_set->entries = entry->set_next;
break; break;
} }
last = tmp; last = tmp;
tmp = last->set_next; tmp = last->set_next;
} }
@ -283,13 +300,13 @@ binding_entry_destroy (GtkBindingEntry *entry)
while (tmp) while (tmp)
{ {
if (tmp == entry) if (tmp == entry)
{ {
if (last) if (last)
last->hash_next = entry->hash_next; last->hash_next = entry->hash_next;
else else
begin = entry->hash_next; begin = entry->hash_next;
break; break;
} }
last = tmp; last = tmp;
tmp = last->hash_next; tmp = last->hash_next;
} }
@ -317,8 +334,8 @@ binding_entry_destroy (GtkBindingEntry *entry)
static GtkBindingEntry* static GtkBindingEntry*
binding_ht_lookup_entry (GtkBindingSet *set, binding_ht_lookup_entry (GtkBindingSet *set,
guint keyval, guint keyval,
GdkModifierType modifiers) GdkModifierType modifiers)
{ {
GtkBindingEntry lookup_entry = { 0 }; GtkBindingEntry lookup_entry = { 0 };
GtkBindingEntry *entry; GtkBindingEntry *entry;
@ -339,9 +356,9 @@ binding_ht_lookup_entry (GtkBindingSet *set,
static gboolean static gboolean
binding_compose_params (GObject *object, binding_compose_params (GObject *object,
GtkBindingArg *args, GtkBindingArg *args,
GSignalQuery *query, GSignalQuery *query,
GValue **params_p) GValue **params_p)
{ {
GValue *params; GValue *params;
const GType *types; const GType *types;
@ -366,85 +383,85 @@ binding_compose_params (GObject *object,
g_value_init (params, *types); g_value_init (params, *types);
switch (G_TYPE_FUNDAMENTAL (args->arg_type)) switch (G_TYPE_FUNDAMENTAL (args->arg_type))
{ {
case G_TYPE_DOUBLE: case G_TYPE_DOUBLE:
g_value_init (&tmp_value, G_TYPE_DOUBLE); g_value_init (&tmp_value, G_TYPE_DOUBLE);
g_value_set_double (&tmp_value, args->d.double_data); g_value_set_double (&tmp_value, args->d.double_data);
break; break;
case G_TYPE_LONG: case G_TYPE_LONG:
g_value_init (&tmp_value, G_TYPE_LONG); g_value_init (&tmp_value, G_TYPE_LONG);
g_value_set_long (&tmp_value, args->d.long_data); g_value_set_long (&tmp_value, args->d.long_data);
break; break;
case G_TYPE_STRING: case G_TYPE_STRING:
/* gtk_rc_parse_flags/enum() has fancier parsing for this; we can't call /* gtk_rc_parse_flags/enum() has fancier parsing for this; we can't call
* that since we don't have a GParamSpec, so just do something simple * that since we don't have a GParamSpec, so just do something simple
*/ */
if (G_TYPE_FUNDAMENTAL (*types) == G_TYPE_ENUM) if (G_TYPE_FUNDAMENTAL (*types) == G_TYPE_ENUM)
{ {
GEnumClass *class = G_ENUM_CLASS (g_type_class_ref (*types)); GEnumClass *class = G_ENUM_CLASS (g_type_class_ref (*types));
valid = FALSE;
if (args->arg_type == GTK_TYPE_IDENTIFIER)
{
GEnumValue *enum_value = NULL;
enum_value = g_enum_get_value_by_name (class, args->d.string_data);
if (!enum_value)
enum_value = g_enum_get_value_by_nick (class, args->d.string_data);
if (enum_value)
{
g_value_init (&tmp_value, *types);
g_value_set_enum (&tmp_value, enum_value->value);
valid = TRUE;
}
}
g_type_class_unref (class); valid = FALSE;
}
/* This is just a hack for compatibility with GTK+-1.2 where a string
* could be used for a single flag value / without the support for multiple
* values in gtk_rc_parse_flags(), this isn't very useful.
*/
else if (G_TYPE_FUNDAMENTAL (*types) == G_TYPE_FLAGS)
{
GFlagsClass *class = G_FLAGS_CLASS (g_type_class_ref (*types));
valid = FALSE;
if (args->arg_type == GTK_TYPE_IDENTIFIER)
{
GFlagsValue *flags_value = NULL;
flags_value = g_flags_get_value_by_name (class, args->d.string_data);
if (!flags_value)
flags_value = g_flags_get_value_by_nick (class, args->d.string_data);
if (flags_value)
{
g_value_init (&tmp_value, *types);
g_value_set_flags (&tmp_value, flags_value->value);
valid = TRUE;
}
}
g_type_class_unref (class); if (args->arg_type == GTK_TYPE_IDENTIFIER)
} {
else GEnumValue *enum_value = NULL;
{ enum_value = g_enum_get_value_by_name (class, args->d.string_data);
g_value_init (&tmp_value, G_TYPE_STRING); if (!enum_value)
g_value_set_static_string (&tmp_value, args->d.string_data); enum_value = g_enum_get_value_by_nick (class, args->d.string_data);
} if (enum_value)
break; {
default: g_value_init (&tmp_value, *types);
valid = FALSE; g_value_set_enum (&tmp_value, enum_value->value);
break; valid = TRUE;
} }
}
g_type_class_unref (class);
}
/* This is just a hack for compatibility with GTK+-1.2 where a string
* could be used for a single flag value / without the support for multiple
* values in gtk_rc_parse_flags(), this isn't very useful.
*/
else if (G_TYPE_FUNDAMENTAL (*types) == G_TYPE_FLAGS)
{
GFlagsClass *class = G_FLAGS_CLASS (g_type_class_ref (*types));
valid = FALSE;
if (args->arg_type == GTK_TYPE_IDENTIFIER)
{
GFlagsValue *flags_value = NULL;
flags_value = g_flags_get_value_by_name (class, args->d.string_data);
if (!flags_value)
flags_value = g_flags_get_value_by_nick (class, args->d.string_data);
if (flags_value)
{
g_value_init (&tmp_value, *types);
g_value_set_flags (&tmp_value, flags_value->value);
valid = TRUE;
}
}
g_type_class_unref (class);
}
else
{
g_value_init (&tmp_value, G_TYPE_STRING);
g_value_set_static_string (&tmp_value, args->d.string_data);
}
break;
default:
valid = FALSE;
break;
}
if (valid) if (valid)
{ {
if (!g_value_transform (&tmp_value, params)) if (!g_value_transform (&tmp_value, params))
valid = FALSE; valid = FALSE;
g_value_unset (&tmp_value); g_value_unset (&tmp_value);
} }
types++; types++;
params++; params++;
@ -456,7 +473,7 @@ binding_compose_params (GObject *object,
guint j; guint j;
for (j = 0; j < i; j++) for (j = 0; j < i; j++)
g_value_unset (&(*params_p)[j]); g_value_unset (&(*params_p)[j]);
g_free (*params_p); g_free (*params_p);
*params_p = NULL; *params_p = NULL;
@ -467,7 +484,7 @@ binding_compose_params (GObject *object,
static gboolean static gboolean
gtk_binding_entry_activate (GtkBindingEntry *entry, gtk_binding_entry_activate (GtkBindingEntry *entry,
GObject *object) GObject *object)
{ {
GtkBindingSignal *sig; GtkBindingSignal *sig;
gboolean old_emission; gboolean old_emission;
@ -489,65 +506,65 @@ gtk_binding_entry_activate (GtkBindingEntry *entry,
signal_id = g_signal_lookup (sig->signal_name, G_OBJECT_TYPE (object)); signal_id = g_signal_lookup (sig->signal_name, G_OBJECT_TYPE (object));
if (!signal_id) if (!signal_id)
{ {
accelerator = gtk_accelerator_name (entry->keyval, entry->modifiers); accelerator = gtk_accelerator_name (entry->keyval, entry->modifiers);
g_warning ("gtk_binding_entry_activate(): binding \"%s::%s\": " g_warning ("gtk_binding_entry_activate(): binding \"%s::%s\": "
"could not find signal \"%s\" in the `%s' class ancestry", "could not find signal \"%s\" in the `%s' class ancestry",
entry->binding_set->set_name, entry->binding_set->set_name,
accelerator, accelerator,
sig->signal_name, sig->signal_name,
g_type_name (G_OBJECT_TYPE (object))); g_type_name (G_OBJECT_TYPE (object)));
g_free (accelerator); g_free (accelerator);
continue; continue;
} }
g_signal_query (signal_id, &query); g_signal_query (signal_id, &query);
if (query.n_params != sig->n_args || if (query.n_params != sig->n_args ||
(query.return_type != G_TYPE_NONE && query.return_type != G_TYPE_BOOLEAN) || (query.return_type != G_TYPE_NONE && query.return_type != G_TYPE_BOOLEAN) ||
!binding_compose_params (object, sig->args, &query, &params)) !binding_compose_params (object, sig->args, &query, &params))
{ {
accelerator = gtk_accelerator_name (entry->keyval, entry->modifiers); accelerator = gtk_accelerator_name (entry->keyval, entry->modifiers);
g_warning ("gtk_binding_entry_activate(): binding \"%s::%s\": " g_warning ("gtk_binding_entry_activate(): binding \"%s::%s\": "
"signature mismatch for signal \"%s\" in the `%s' class ancestry", "signature mismatch for signal \"%s\" in the `%s' class ancestry",
entry->binding_set->set_name, entry->binding_set->set_name,
accelerator, accelerator,
sig->signal_name, sig->signal_name,
g_type_name (G_OBJECT_TYPE (object))); g_type_name (G_OBJECT_TYPE (object)));
} }
else if (!(query.signal_flags & G_SIGNAL_ACTION)) else if (!(query.signal_flags & G_SIGNAL_ACTION))
{ {
accelerator = gtk_accelerator_name (entry->keyval, entry->modifiers); accelerator = gtk_accelerator_name (entry->keyval, entry->modifiers);
g_warning ("gtk_binding_entry_activate(): binding \"%s::%s\": " g_warning ("gtk_binding_entry_activate(): binding \"%s::%s\": "
"signal \"%s\" in the `%s' class ancestry cannot be used for action emissions", "signal \"%s\" in the `%s' class ancestry cannot be used for action emissions",
entry->binding_set->set_name, entry->binding_set->set_name,
accelerator, accelerator,
sig->signal_name, sig->signal_name,
g_type_name (G_OBJECT_TYPE (object))); g_type_name (G_OBJECT_TYPE (object)));
} }
g_free (accelerator); g_free (accelerator);
if (accelerator) if (accelerator)
continue; continue;
if (query.return_type == G_TYPE_BOOLEAN) if (query.return_type == G_TYPE_BOOLEAN)
g_value_init (&return_val, G_TYPE_BOOLEAN); g_value_init (&return_val, G_TYPE_BOOLEAN);
g_signal_emitv (params, signal_id, 0, &return_val); g_signal_emitv (params, signal_id, 0, &return_val);
if (query.return_type == G_TYPE_BOOLEAN) if (query.return_type == G_TYPE_BOOLEAN)
{ {
if (g_value_get_boolean (&return_val)) if (g_value_get_boolean (&return_val))
handled = TRUE; handled = TRUE;
g_value_unset (&return_val); g_value_unset (&return_val);
} }
else else
handled = TRUE; handled = TRUE;
for (i = 0; i < query.n_params + 1; i++) for (i = 0; i < query.n_params + 1; i++)
g_value_unset (&params[i]); g_value_unset (&params[i]);
g_free (params); g_free (params);
if (entry->destroyed) if (entry->destroyed)
break; break;
} }
g_object_unref (object); g_object_unref (object);
@ -617,9 +634,9 @@ gtk_binding_set_by_class (gpointer object_class)
binding_set = gtk_binding_set_new (g_type_name (G_OBJECT_CLASS_TYPE (class))); binding_set = gtk_binding_set_new (g_type_name (G_OBJECT_CLASS_TYPE (class)));
gtk_binding_set_add_path (binding_set, gtk_binding_set_add_path (binding_set,
GTK_PATH_CLASS, GTK_PATH_CLASS,
g_type_name (G_OBJECT_CLASS_TYPE (class)), g_type_name (G_OBJECT_CLASS_TYPE (class)),
GTK_PATH_PRIO_GTK); GTK_PATH_PRIO_GTK);
g_dataset_id_set_data (class, key_id_class_binding_set, binding_set); g_dataset_id_set_data (class, key_id_class_binding_set, binding_set);
return binding_set; return binding_set;
@ -648,7 +665,7 @@ gtk_binding_set_find (const gchar *set_name)
binding_set = slist->data; binding_set = slist->data;
if (g_str_equal (binding_set->set_name, (gpointer) set_name)) if (g_str_equal (binding_set->set_name, (gpointer) set_name))
return binding_set; return binding_set;
} }
return NULL; return NULL;
} }
@ -666,10 +683,10 @@ gtk_binding_set_find (const gchar *set_name)
* Return value: %TRUE if a binding was found and activated * Return value: %TRUE if a binding was found and activated
*/ */
gboolean gboolean
gtk_binding_set_activate (GtkBindingSet *binding_set, gtk_binding_set_activate (GtkBindingSet *binding_set,
guint keyval, guint keyval,
GdkModifierType modifiers, GdkModifierType modifiers,
GObject *object) GObject *object)
{ {
GtkBindingEntry *entry; GtkBindingEntry *entry;
@ -745,9 +762,9 @@ gtk_binding_entry_skip (GtkBindingSet *binding_set,
* gtk_binding_entry_add_signal() on @binding_set. * gtk_binding_entry_add_signal() on @binding_set.
*/ */
void void
gtk_binding_entry_remove (GtkBindingSet *binding_set, gtk_binding_entry_remove (GtkBindingSet *binding_set,
guint keyval, guint keyval,
GdkModifierType modifiers) GdkModifierType modifiers)
{ {
GtkBindingEntry *entry; GtkBindingEntry *entry;
@ -775,10 +792,10 @@ gtk_binding_entry_remove (GtkBindingSet *binding_set,
*/ */
void void
gtk_binding_entry_add_signall (GtkBindingSet *binding_set, gtk_binding_entry_add_signall (GtkBindingSet *binding_set,
guint keyval, guint keyval,
GdkModifierType modifiers, GdkModifierType modifiers,
const gchar *signal_name, const gchar *signal_name,
GSList *binding_args) GSList *binding_args)
{ {
_gtk_binding_entry_add_signall (binding_set, _gtk_binding_entry_add_signall (binding_set,
keyval, modifiers, keyval, modifiers,
@ -787,10 +804,10 @@ gtk_binding_entry_add_signall (GtkBindingSet *binding_set,
void void
_gtk_binding_entry_add_signall (GtkBindingSet *binding_set, _gtk_binding_entry_add_signall (GtkBindingSet *binding_set,
guint keyval, guint keyval,
GdkModifierType modifiers, GdkModifierType modifiers,
const gchar *signal_name, const gchar *signal_name,
GSList *binding_args) GSList *binding_args)
{ {
GtkBindingEntry *entry; GtkBindingEntry *entry;
GtkBindingSignal *signal, **signal_p; GtkBindingSignal *signal, **signal_p;
@ -813,40 +830,40 @@ _gtk_binding_entry_add_signall (GtkBindingSet *binding_set,
tmp_arg = slist->data; tmp_arg = slist->data;
if (!tmp_arg) if (!tmp_arg)
{ {
g_warning ("gtk_binding_entry_add_signall(): arg[%u] is `NULL'", n); g_warning ("gtk_binding_entry_add_signall(): arg[%u] is `NULL'", n);
binding_signal_free (signal); binding_signal_free (signal);
return; return;
} }
switch (G_TYPE_FUNDAMENTAL (tmp_arg->arg_type)) switch (G_TYPE_FUNDAMENTAL (tmp_arg->arg_type))
{ {
case G_TYPE_LONG: case G_TYPE_LONG:
arg->arg_type = G_TYPE_LONG; arg->arg_type = G_TYPE_LONG;
arg->d.long_data = tmp_arg->d.long_data; arg->d.long_data = tmp_arg->d.long_data;
break; break;
case G_TYPE_DOUBLE: case G_TYPE_DOUBLE:
arg->arg_type = G_TYPE_DOUBLE; arg->arg_type = G_TYPE_DOUBLE;
arg->d.double_data = tmp_arg->d.double_data; arg->d.double_data = tmp_arg->d.double_data;
break; break;
case G_TYPE_STRING: case G_TYPE_STRING:
if (tmp_arg->arg_type != GTK_TYPE_IDENTIFIER) if (tmp_arg->arg_type != GTK_TYPE_IDENTIFIER)
arg->arg_type = G_TYPE_STRING; arg->arg_type = G_TYPE_STRING;
else else
arg->arg_type = GTK_TYPE_IDENTIFIER; arg->arg_type = GTK_TYPE_IDENTIFIER;
arg->d.string_data = g_strdup (tmp_arg->d.string_data); arg->d.string_data = g_strdup (tmp_arg->d.string_data);
if (!arg->d.string_data) if (!arg->d.string_data)
{ {
g_warning ("gtk_binding_entry_add_signall(): value of `string' arg[%u] is `NULL'", n); g_warning ("gtk_binding_entry_add_signall(): value of `string' arg[%u] is `NULL'", n);
binding_signal_free (signal); binding_signal_free (signal);
return; return;
} }
break; break;
default: default:
g_warning ("gtk_binding_entry_add_signall(): unsupported type `%s' for arg[%u]", g_warning ("gtk_binding_entry_add_signall(): unsupported type `%s' for arg[%u]",
g_type_name (arg->arg_type), n); g_type_name (arg->arg_type), n);
binding_signal_free (signal); binding_signal_free (signal);
return; return;
} }
arg++; arg++;
n++; n++;
} }
@ -879,11 +896,11 @@ _gtk_binding_entry_add_signall (GtkBindingSet *binding_set,
*/ */
void void
gtk_binding_entry_add_signal (GtkBindingSet *binding_set, gtk_binding_entry_add_signal (GtkBindingSet *binding_set,
guint keyval, guint keyval,
GdkModifierType modifiers, GdkModifierType modifiers,
const gchar *signal_name, const gchar *signal_name,
guint n_args, guint n_args,
...) ...)
{ {
GSList *slist, *free_slist; GSList *slist, *free_slist;
va_list args; va_list args;
@ -903,45 +920,45 @@ gtk_binding_entry_add_signal (GtkBindingSet *binding_set,
arg->arg_type = va_arg (args, GType); arg->arg_type = va_arg (args, GType);
switch (G_TYPE_FUNDAMENTAL (arg->arg_type)) switch (G_TYPE_FUNDAMENTAL (arg->arg_type))
{ {
case G_TYPE_CHAR: case G_TYPE_CHAR:
case G_TYPE_UCHAR: case G_TYPE_UCHAR:
case G_TYPE_INT: case G_TYPE_INT:
case G_TYPE_UINT: case G_TYPE_UINT:
case G_TYPE_BOOLEAN: case G_TYPE_BOOLEAN:
case G_TYPE_ENUM: case G_TYPE_ENUM:
case G_TYPE_FLAGS: case G_TYPE_FLAGS:
arg->arg_type = G_TYPE_LONG; arg->arg_type = G_TYPE_LONG;
arg->d.long_data = va_arg (args, gint); arg->d.long_data = va_arg (args, gint);
break; break;
case G_TYPE_LONG: case G_TYPE_LONG:
case G_TYPE_ULONG: case G_TYPE_ULONG:
arg->arg_type = G_TYPE_LONG; arg->arg_type = G_TYPE_LONG;
arg->d.long_data = va_arg (args, glong); arg->d.long_data = va_arg (args, glong);
break; break;
case G_TYPE_FLOAT: case G_TYPE_FLOAT:
case G_TYPE_DOUBLE: case G_TYPE_DOUBLE:
arg->arg_type = G_TYPE_DOUBLE; arg->arg_type = G_TYPE_DOUBLE;
arg->d.double_data = va_arg (args, gdouble); arg->d.double_data = va_arg (args, gdouble);
break; break;
case G_TYPE_STRING: case G_TYPE_STRING:
if (arg->arg_type != GTK_TYPE_IDENTIFIER) if (arg->arg_type != GTK_TYPE_IDENTIFIER)
arg->arg_type = G_TYPE_STRING; arg->arg_type = G_TYPE_STRING;
arg->d.string_data = va_arg (args, gchar*); arg->d.string_data = va_arg (args, gchar*);
if (!arg->d.string_data) if (!arg->d.string_data)
{ {
g_warning ("gtk_binding_entry_add_signal(): type `%s' arg[%u] is `NULL'", g_warning ("gtk_binding_entry_add_signal(): type `%s' arg[%u] is `NULL'",
g_type_name (arg->arg_type), g_type_name (arg->arg_type),
i); i);
i += n_args + 1; i += n_args + 1;
} }
break; break;
default: default:
g_warning ("gtk_binding_entry_add_signal(): unsupported type `%s' for arg[%u]", g_warning ("gtk_binding_entry_add_signal(): unsupported type `%s' for arg[%u]",
g_type_name (arg->arg_type), i); g_type_name (arg->arg_type), i);
i += n_args + 1; i += n_args + 1;
break; break;
} }
} }
va_end (args); va_end (args);
@ -973,10 +990,10 @@ gtk_binding_entry_add_signal (GtkBindingSet *binding_set,
* Deprecated: 3.0 * Deprecated: 3.0
*/ */
void void
gtk_binding_set_add_path (GtkBindingSet *binding_set, gtk_binding_set_add_path (GtkBindingSet *binding_set,
GtkPathType path_type, GtkPathType path_type,
const gchar *path_pattern, const gchar *path_pattern,
GtkPathPriorityType priority) GtkPathPriorityType priority)
{ {
PatternSpec *pspec; PatternSpec *pspec;
GSList **slist_p, *slist; GSList **slist_p, *slist;
@ -1024,18 +1041,18 @@ gtk_binding_set_add_path (GtkBindingSet *binding_set,
slist = slist->next; slist = slist->next;
if (g_pattern_spec_equal (tmp_pspec->pspec, pspec->pspec)) if (g_pattern_spec_equal (tmp_pspec->pspec, pspec->pspec))
{ {
GtkPathPriorityType lprio = tmp_pspec->seq_id >> 28; GtkPathPriorityType lprio = tmp_pspec->seq_id >> 28;
pattern_spec_free (pspec); pattern_spec_free (pspec);
pspec = NULL; pspec = NULL;
if (lprio < priority) if (lprio < priority)
{ {
tmp_pspec->seq_id &= 0x0fffffff; tmp_pspec->seq_id &= 0x0fffffff;
tmp_pspec->seq_id |= priority << 28; tmp_pspec->seq_id |= priority << 28;
} }
break; break;
} }
} }
if (pspec) if (pspec)
{ {
@ -1046,10 +1063,10 @@ gtk_binding_set_add_path (GtkBindingSet *binding_set,
static gboolean static gboolean
binding_match_activate (GSList *pspec_list, binding_match_activate (GSList *pspec_list,
GObject *object, GObject *object,
guint path_length, guint path_length,
gchar *path, gchar *path,
gchar *path_reversed, gchar *path_reversed,
gboolean *unbound) gboolean *unbound)
{ {
GSList *slist; GSList *slist;
@ -1067,7 +1084,7 @@ binding_match_activate (GSList *pspec_list,
if (pspec->type != GTK_PATH_WIDGET_CLASS) if (pspec->type != GTK_PATH_WIDGET_CLASS)
{ {
if (g_pattern_match (pspec->pspec, path_length, path, path_reversed)) if (g_pattern_match (pspec->pspec, path_length, path, path_reversed))
binding_set = pspec->user_data; binding_set = pspec->user_data;
} }
if (binding_set) if (binding_set)
@ -1088,7 +1105,7 @@ binding_match_activate (GSList *pspec_list,
static gint static gint
gtk_binding_pattern_compare (gconstpointer new_pattern, gtk_binding_pattern_compare (gconstpointer new_pattern,
gconstpointer existing_pattern) gconstpointer existing_pattern)
{ {
register const PatternSpec *np = new_pattern; register const PatternSpec *np = new_pattern;
register const PatternSpec *ep = existing_pattern; register const PatternSpec *ep = existing_pattern;
@ -1102,8 +1119,8 @@ gtk_binding_pattern_compare (gconstpointer new_pattern,
static GSList* static GSList*
gtk_binding_entries_sort_patterns (GSList *entries, gtk_binding_entries_sort_patterns (GSList *entries,
GtkPathType path_id, GtkPathType path_id,
gboolean is_release) gboolean is_release)
{ {
GSList *patterns; GSList *patterns;
GSList *tmp_list; GSList *tmp_list;
@ -1125,34 +1142,34 @@ gtk_binding_entries_sort_patterns (GSList *entries,
GSList *slist = NULL; GSList *slist = NULL;
if (is_release != ((entry->modifiers & GDK_RELEASE_MASK) != 0)) if (is_release != ((entry->modifiers & GDK_RELEASE_MASK) != 0))
continue; continue;
binding_set = entry->binding_set; binding_set = entry->binding_set;
if (binding_set->current) if (binding_set->current)
continue; continue;
binding_set->current = entry; binding_set->current = entry;
switch (path_id) switch (path_id)
{ {
case GTK_PATH_WIDGET: case GTK_PATH_WIDGET:
slist = binding_set->widget_path_pspecs; slist = binding_set->widget_path_pspecs;
break; break;
case GTK_PATH_WIDGET_CLASS: case GTK_PATH_WIDGET_CLASS:
slist = binding_set->widget_class_pspecs; slist = binding_set->widget_class_pspecs;
break; break;
case GTK_PATH_CLASS: case GTK_PATH_CLASS:
slist = binding_set->class_branch_pspecs; slist = binding_set->class_branch_pspecs;
break; break;
} }
for (; slist; slist = slist->next) for (; slist; slist = slist->next)
{ {
PatternSpec *pspec; PatternSpec *pspec;
pspec = slist->data; pspec = slist->data;
patterns = g_slist_insert_sorted (patterns, pspec, gtk_binding_pattern_compare); patterns = g_slist_insert_sorted (patterns, pspec, gtk_binding_pattern_compare);
} }
} }
return patterns; return patterns;
@ -1160,8 +1177,8 @@ gtk_binding_entries_sort_patterns (GSList *entries,
static gboolean static gboolean
gtk_bindings_activate_list (GObject *object, gtk_bindings_activate_list (GObject *object,
GSList *entries, GSList *entries,
gboolean is_release) gboolean is_release)
{ {
gboolean handled = FALSE; gboolean handled = FALSE;
@ -1179,24 +1196,24 @@ gtk_bindings_activate_list (GObject *object,
patterns = gtk_binding_entries_sort_patterns (entries, GTK_PATH_CLASS, is_release); patterns = gtk_binding_entries_sort_patterns (entries, GTK_PATH_CLASS, is_release);
class_type = G_TYPE_FROM_INSTANCE (object); class_type = G_TYPE_FROM_INSTANCE (object);
while (class_type && !handled) while (class_type && !handled)
{ {
guint path_length; guint path_length;
gchar *path; gchar *path;
gchar *path_reversed; gchar *path_reversed;
path = g_strdup (g_type_name (class_type)); path = g_strdup (g_type_name (class_type));
path_reversed = g_strdup (path); path_reversed = g_strdup (path);
g_strreverse (path_reversed); g_strreverse (path_reversed);
path_length = strlen (path); path_length = strlen (path);
handled = binding_match_activate (patterns, object, path_length, path, path_reversed, &unbound); handled = binding_match_activate (patterns, object, path_length, path, path_reversed, &unbound);
g_free (path); g_free (path);
g_free (path_reversed); g_free (path_reversed);
if (unbound) if (unbound)
break; break;
class_type = g_type_parent (class_type); class_type = g_type_parent (class_type);
} }
g_slist_free (patterns); g_slist_free (patterns);
if (unbound) if (unbound)
@ -1219,8 +1236,8 @@ gtk_bindings_activate_list (GObject *object,
*/ */
gboolean gboolean
gtk_bindings_activate (GObject *object, gtk_bindings_activate (GObject *object,
guint keyval, guint keyval,
GdkModifierType modifiers) GdkModifierType modifiers)
{ {
GSList *entries = NULL; GSList *entries = NULL;
GdkDisplay *display; GdkDisplay *display;
@ -1274,13 +1291,13 @@ gtk_bindings_activate_event (GObject *object,
key_hash = binding_key_hash_for_keymap (gdk_keymap_get_for_display (display)); key_hash = binding_key_hash_for_keymap (gdk_keymap_get_for_display (display));
entries = _gtk_key_hash_lookup (key_hash, entries = _gtk_key_hash_lookup (key_hash,
event->hardware_keycode, event->hardware_keycode,
event->state, event->state,
BINDING_MOD_MASK () & ~GDK_RELEASE_MASK, BINDING_MOD_MASK () & ~GDK_RELEASE_MASK,
event->group); event->group);
handled = gtk_bindings_activate_list (object, entries, handled = gtk_bindings_activate_list (object, entries,
event->type == GDK_KEY_RELEASE); event->type == GDK_KEY_RELEASE);
g_slist_free (entries); g_slist_free (entries);

1
gtk/gtkbutton.c
View File

@ -55,6 +55,7 @@
#include "gtkiconfactory.h" #include "gtkiconfactory.h"
#include "gtkactivatable.h" #include "gtkactivatable.h"
#include "gtksizerequest.h" #include "gtksizerequest.h"
#include "gtktypebuiltins.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkintl.h" #include "gtkintl.h"

1
gtk/gtkcellrendereraccel.c
View File

@ -28,6 +28,7 @@
#include "gtkeventbox.h" #include "gtkeventbox.h"
#include "gtkmain.h" #include "gtkmain.h"
#include "gtksizerequest.h" #include "gtksizerequest.h"
#include "gtktypebuiltins.h"
#include "gtkprivate.h" #include "gtkprivate.h"

1
gtk/gtkcombobox.c
View File

@ -40,6 +40,7 @@
#include "gtktreeselection.h" #include "gtktreeselection.h"
#include "gtkvseparator.h" #include "gtkvseparator.h"
#include "gtkwindow.h" #include "gtkwindow.h"
#include "gtktypebuiltins.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include <gobject/gvaluecollector.h> #include <gobject/gvaluecollector.h>

6
gtk/gtkcontainer.c
View File

@ -32,8 +32,12 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <gobject/gobjectnotifyqueue.c>
#include <gobject/gvaluecollector.h>
#include "gtkbuildable.h" #include "gtkbuildable.h"
#include "gtkbuilderprivate.h" #include "gtkbuilderprivate.h"
#include "gtktypebuiltins.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkmain.h" #include "gtkmain.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
@ -42,8 +46,6 @@
#include "gtkwindow.h" #include "gtkwindow.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtktoolbar.h" #include "gtktoolbar.h"
#include <gobject/gobjectnotifyqueue.c>
#include <gobject/gvaluecollector.h>
/** /**

1
gtk/gtkentry.c
View File

@ -58,6 +58,7 @@
#include "gtkwindow.h" #include "gtkwindow.h"
#include "gtktreeview.h" #include "gtktreeview.h"
#include "gtktreeselection.h" #include "gtktreeselection.h"
#include "gtktypebuiltins.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkentryprivate.h" #include "gtkentryprivate.h"
#include "gtkcelllayout.h" #include "gtkcelllayout.h"

1
gtk/gtkfilechooserbutton.c
View File

@ -52,6 +52,7 @@
#include "gtkfilechooserbutton.h" #include "gtkfilechooserbutton.h"
#include "gtktypebuiltins.h"
#include "gtkprivate.h" #include "gtkprivate.h"
/* **************** * /* **************** *

1
gtk/gtkframe.c
View File

@ -29,6 +29,7 @@
#include "gtkframe.h" #include "gtkframe.h"
#include "gtklabel.h" #include "gtklabel.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtktypebuiltins.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkbuildable.h" #include "gtkbuildable.h"

3
gtk/gtkhandlebox.c
View File

@ -26,12 +26,15 @@
*/ */
#include "config.h" #include "config.h"
#include <stdlib.h> #include <stdlib.h>
#include "gtkhandlebox.h" #include "gtkhandlebox.h"
#include "gtkinvisible.h" #include "gtkinvisible.h"
#include "gtkmain.h" #include "gtkmain.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include "gtkwindow.h" #include "gtkwindow.h"
#include "gtktypebuiltins.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkintl.h" #include "gtkintl.h"

4
gtk/gtkiconfactory.c
View File

@ -25,9 +25,11 @@
*/ */
#include "config.h" #include "config.h"
#include <stdlib.h> #include <stdlib.h>
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
#include "gtkiconfactory.h" #include "gtkiconfactory.h"
#include "gtkiconcache.h" #include "gtkiconcache.h"
#include "gtkdebug.h" #include "gtkdebug.h"
@ -38,7 +40,7 @@
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkbuildable.h" #include "gtkbuildable.h"
#include "gtkbuilderprivate.h" #include "gtkbuilderprivate.h"
#include "gtktypebuiltins.h"
static GSList *all_icon_factories = NULL; static GSList *all_icon_factories = NULL;

1
gtk/gtkiconview.c
View File

@ -41,6 +41,7 @@
#include "gtkscrollable.h" #include "gtkscrollable.h"
#include "gtksizerequest.h" #include "gtksizerequest.h"
#include "gtktreednd.h" #include "gtktreednd.h"
#include "gtktypebuiltins.h"
#include "gtkprivate.h" #include "gtkprivate.h"
/** /**

2
gtk/gtkimage.c
View File

@ -25,6 +25,7 @@
*/ */
#include "config.h" #include "config.h"
#include <math.h> #include <math.h>
#include <string.h> #include <string.h>
@ -36,6 +37,7 @@
#include "gtksizerequest.h" #include "gtksizerequest.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtktypebuiltins.h"
/** /**
* SECTION:gtkimage * SECTION:gtkimage

1
gtk/gtkinfobar.c
View File

@ -46,6 +46,7 @@
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkstock.h" #include "gtkstock.h"
#include "gtktypebuiltins.h"
/** /**
* SECTION:gtkinfobar * SECTION:gtkinfobar

1
gtk/gtklabel.c
View File

@ -50,6 +50,7 @@
#include "gtkshow.h" #include "gtkshow.h"
#include "gtktooltip.h" #include "gtktooltip.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtktypebuiltins.h"
/*rint() is only available in GCC and/or C99*/ /*rint() is only available in GCC and/or C99*/
#if (__STDC_VERSION__ < 199901L && !defined __GNUC__) #if (__STDC_VERSION__ < 199901L && !defined __GNUC__)

1
gtk/gtkmain.h
View File

@ -33,7 +33,6 @@
#include <gdk/gdk.h> #include <gdk/gdk.h>
#include <gtk/gtktypeutils.h>
#include <gtk/gtkwidget.h> #include <gtk/gtkwidget.h>
#ifdef G_PLATFORM_WIN32 #ifdef G_PLATFORM_WIN32
#include <gtk/gtkbox.h> #include <gtk/gtkbox.h>

1
gtk/gtkmenu.c
View File

@ -46,6 +46,7 @@
#include "gtksettings.h" #include "gtksettings.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtktypebuiltins.h"
#define NAVIGATION_REGION_OVERSHOOT 50 /* How much the navigation region #define NAVIGATION_REGION_OVERSHOOT 50 /* How much the navigation region
* extends below the submenu * extends below the submenu

2
gtk/gtkmenubar.c
View File

@ -37,9 +37,9 @@
#include "gtksettings.h" #include "gtksettings.h"
#include "gtksizerequest.h" #include "gtksizerequest.h"
#include "gtkwindow.h" #include "gtkwindow.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtktypebuiltins.h"
#define BORDER_SPACING 0 #define BORDER_SPACING 0
#define DEFAULT_IPADDING 1 #define DEFAULT_IPADDING 1

2
gtk/gtkmenuitem.c
View File

@ -25,6 +25,7 @@
*/ */
#include "config.h" #include "config.h"
#include <string.h> #include <string.h>
#include "gtkaccellabel.h" #include "gtkaccellabel.h"
@ -40,6 +41,7 @@
#include "gtkbuildable.h" #include "gtkbuildable.h"
#include "gtkactivatable.h" #include "gtkactivatable.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtktypebuiltins.h"
enum { enum {

1
gtk/gtkmenushell.c
View File

@ -40,6 +40,7 @@
#include "gtkwindow.h" #include "gtkwindow.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtktypebuiltins.h"
#define MENU_SHELL_TIMEOUT 500 #define MENU_SHELL_TIMEOUT 500

2
gtk/gtkmessagedialog.c
View File

@ -26,6 +26,7 @@
*/ */
#include "config.h" #include "config.h"
#include <string.h> #include <string.h>
#include "gtkmessagedialog.h" #include "gtkmessagedialog.h"
@ -39,6 +40,7 @@
#include "gtkiconfactory.h" #include "gtkiconfactory.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtktypebuiltins.h"
/** /**
* SECTION:gtkmessagedialog * SECTION:gtkmessagedialog

1
gtk/gtknotebook.c
View File

@ -42,6 +42,7 @@
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkdnd.h" #include "gtkdnd.h"
#include "gtkbuildable.h" #include "gtkbuildable.h"
#include "gtktypebuiltins.h"
/** /**

2
gtk/gtkpaned.c
View File

@ -33,7 +33,7 @@
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include "gtkorientable.h" #include "gtkorientable.h"
#include "gtkwindow.h" #include "gtkwindow.h"
#include "gtktypebuiltins.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkintl.h" #include "gtkintl.h"

8
gtk/gtkprintoperation.c
View File

@ -21,16 +21,18 @@
#include "config.h" #include "config.h"
#include <errno.h> #include <errno.h>
#include <stdlib.h> #include <stdlib.h>
#include <math.h> #include <math.h>
#include <string.h> #include <string.h>
#include <cairo-pdf.h>
#include "gtkprintoperation-private.h" #include "gtkprintoperation-private.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include <cairo-pdf.h>
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkmessagedialog.h" #include "gtkmessagedialog.h"
#include "gtktypebuiltins.h"
#define SHOW_PROGRESS_TIME 1200 #define SHOW_PROGRESS_TIME 1200

6
gtk/gtkprintsettings.c
View File

@ -19,12 +19,16 @@
*/ */
#include "config.h" #include "config.h"
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <glib/gprintf.h> #include <glib/gprintf.h>
#include <gtk/gtk.h>
#include "gtkprintsettings.h" #include "gtkprintsettings.h"
#include "gtkprintutils.h" #include "gtkprintutils.h"
#include "gtktypebuiltins.h"
#include "gtkwidget.h"
typedef struct _GtkPrintSettingsClass GtkPrintSettingsClass; typedef struct _GtkPrintSettingsClass GtkPrintSettingsClass;

21
gtk/gtkprintunixdialog.c
View File

@ -20,14 +20,20 @@
*/ */
#include "config.h" #include "config.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
#include <stdio.h> #include <stdio.h>
#include <math.h> #include <math.h>
#include "gtkintl.h" #include "gtkprintunixdialog.h"
#include "gtkprivate.h"
#include "gtkcustompaperunixdialog.h"
#include "gtkprintbackend.h"
#include "gtkprinter-private.h"
#include "gtkprinteroptionwidget.h"
#include "gtkprintutils.h"
#include "gtkspinbutton.h" #include "gtkspinbutton.h"
#include "gtkcellrendererpixbuf.h" #include "gtkcellrendererpixbuf.h"
@ -49,16 +55,11 @@
#include "gtklabel.h" #include "gtklabel.h"
#include "gtkeventbox.h" #include "gtkeventbox.h"
#include "gtkbuildable.h" #include "gtkbuildable.h"
#include "gtkcustompaperunixdialog.h"
#include "gtkprintbackend.h"
#include "gtkprinter-private.h"
#include "gtkprintunixdialog.h"
#include "gtkprinteroptionwidget.h"
#include "gtkprintutils.h"
#include "gtkmessagedialog.h" #include "gtkmessagedialog.h"
#include "gtkbutton.h" #include "gtkbutton.h"
#include "gtkintl.h"
#include "gtkprivate.h"
#include "gtktypebuiltins.h"
#define EXAMPLE_PAGE_AREA_SIZE 110 #define EXAMPLE_PAGE_AREA_SIZE 110
#define RULER_DISTANCE 7.5 #define RULER_DISTANCE 7.5

1
gtk/gtkrange.c
View File

@ -39,6 +39,7 @@
#include "gtkwindow.h" #include "gtkwindow.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtktypebuiltins.h"
/** /**
* SECTION:gtkrange * SECTION:gtkrange

2
gtk/gtkscalebutton.c
View File

@ -53,7 +53,7 @@
#include "gtkstock.h" #include "gtkstock.h"
#include "gtkvbox.h" #include "gtkvbox.h"
#include "gtkwindow.h" #include "gtkwindow.h"
#include "gtktypebuiltins.h"
#include "gtkintl.h" #include "gtkintl.h"
/** /**

1
gtk/gtkscrolledwindow.c
View File

@ -34,6 +34,7 @@
#include "gtkscrolledwindow.h" #include "gtkscrolledwindow.h"
#include "gtkwindow.h" #include "gtkwindow.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtktypebuiltins.h"
#include "gtkintl.h" #include "gtkintl.h"

1
gtk/gtkspinbutton.c
View File

@ -43,6 +43,7 @@
#include "gtksettings.h" #include "gtksettings.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtktypebuiltins.h"
#define MIN_SPIN_BUTTON_WIDTH 30 #define MIN_SPIN_BUTTON_WIDTH 30
#define MAX_TIMER_CALLS 5 #define MAX_TIMER_CALLS 5

2
gtk/gtkstatusbar.c
View File

@ -26,6 +26,7 @@
*/ */
#include "config.h" #include "config.h"
#include "gtkframe.h" #include "gtkframe.h"
#include "gtklabel.h" #include "gtklabel.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
@ -34,6 +35,7 @@
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkbuildable.h" #include "gtkbuildable.h"
#include "gtktypebuiltins.h"
/** /**
* SECTION:gtkstatusbar * SECTION:gtkstatusbar

16
gtk/gtkstatusicon.c
View File

@ -42,27 +42,19 @@
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkwidget.h" #include "gtkwidget.h"
#include "gtktooltip.h" #include "gtktooltip.h"
#include "gtkicontheme.h"
#include "gtklabel.h"
#include "gtktypebuiltins.h"
#ifdef GDK_WINDOWING_X11 #ifdef GDK_WINDOWING_X11
#include "gdk/x11/gdkx.h" #include "gdk/x11/gdkx.h"
#endif #endif
#ifdef GDK_WINDOWING_WIN32 #ifdef GDK_WINDOWING_WIN32
#include "gdk/win32/gdkwin32.h" #include "gdk/win32/gdkwin32.h"
#endif
#ifdef GDK_WINDOWING_WIN32
#include "gtkicontheme.h"
#include "gtklabel.h"
#include "win32/gdkwin32.h"
#define WM_GTK_TRAY_NOTIFICATION (WM_USER+1) #define WM_GTK_TRAY_NOTIFICATION (WM_USER+1)
#endif #endif
#ifdef GDK_WINDOWING_QUARTZ
#include "gtkicontheme.h"
#include "gtklabel.h"
#endif
#define BLINK_TIMEOUT 500 #define BLINK_TIMEOUT 500
enum enum

15
gtk/gtkstock.h
View File

@ -33,10 +33,23 @@
#include <gdk/gdk.h> #include <gdk/gdk.h>
#include <gtk/gtktypeutils.h> /* for GtkTranslateFunc */
G_BEGIN_DECLS G_BEGIN_DECLS
/*
* GtkTranslateFunc:
* @path: The id of the message. In #GtkActionGroup this will be a label
* or tooltip from a #GtkActionEntry.
* @func_data: user data passed in when registering the function
*
* The function used to translate messages in e.g. #GtkIconFactory
* and #GtkActionGroup.
*
* Returns: the translated message
*/
typedef gchar * (*GtkTranslateFunc) (const gchar *path,
gpointer func_data);
typedef struct _GtkStockItem GtkStockItem; typedef struct _GtkStockItem GtkStockItem;
struct _GtkStockItem struct _GtkStockItem

8
gtk/gtktexttag.c
View File

@ -48,6 +48,10 @@
*/ */
#include "config.h" #include "config.h"
#include <stdlib.h>
#include <string.h>
#include "gtkmain.h" #include "gtkmain.h"
#include "gtktexttag.h" #include "gtktexttag.h"
#include "gtktexttypes.h" #include "gtktexttypes.h"
@ -55,9 +59,7 @@
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtktypebuiltins.h"
#include <stdlib.h>
#include <string.h>
enum { enum {
EVENT, EVENT,

1
gtk/gtktextview.c
View File

@ -50,6 +50,7 @@
#include "gtkwidgetprivate.h" #include "gtkwidgetprivate.h"
#include "gtkwindow.h" #include "gtkwindow.h"
#include "gtkscrollable.h" #include "gtkscrollable.h"
#include "gtktypebuiltins.h"
/** /**

1
gtk/gtktoolbar.c
View File

@ -55,6 +55,7 @@
#include "gtkvbox.h" #include "gtkvbox.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtktypebuiltins.h"
/** /**

6
gtk/gtktoolitemgroup.c
View File

@ -22,11 +22,11 @@
#include "config.h" #include "config.h"
#include "gtktoolpaletteprivate.h"
#include <gtk/gtk.h>
#include <math.h> #include <math.h>
#include <string.h> #include <string.h>
#include "gtktoolpaletteprivate.h"
#include "gtktypebuiltins.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkintl.h" #include "gtkintl.h"

2
gtk/gtktoolpalette.c
View File

@ -26,7 +26,7 @@
#include "gtktoolpaletteprivate.h" #include "gtktoolpaletteprivate.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include "gtktypebuiltins.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkscrollable.h" #include "gtkscrollable.h"
#include "gtkintl.h" #include "gtkintl.h"

10
gtk/gtktrayicon-x11.c
View File

@ -23,18 +23,20 @@
*/ */
#include "config.h" #include "config.h"
#include <math.h> #include <math.h>
#include <string.h> #include <string.h>
#include "x11/gdkx.h"
#include <X11/Xatom.h>
#include <cairo-xlib.h>
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtktrayicon.h" #include "gtktrayicon.h"
#include "gtktestutils.h" #include "gtktestutils.h"
#include "gtkdebug.h" #include "gtkdebug.h"
#include "gtktypebuiltins.h"
#include "x11/gdkx.h"
#include <X11/Xatom.h>
#include <cairo-xlib.h>
#define SYSTEM_TRAY_REQUEST_DOCK 0 #define SYSTEM_TRAY_REQUEST_DOCK 0
#define SYSTEM_TRAY_BEGIN_MESSAGE 1 #define SYSTEM_TRAY_BEGIN_MESSAGE 1

1
gtk/gtktreeview.c
View File

@ -49,6 +49,7 @@
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkwidgetprivate.h" #include "gtkwidgetprivate.h"
#include "gtkentryprivate.h" #include "gtkentryprivate.h"
#include "gtktypebuiltins.h"
/** /**

1
gtk/gtktreeviewcolumn.c
View File

@ -36,6 +36,7 @@
#include "gtkcellareabox.h" #include "gtkcellareabox.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtktypebuiltins.h"
/** /**

47
gtk/gtktypeutils.c
View File

@ -1,47 +0,0 @@
/* GTK - The GIMP Toolkit
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
/*
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#include "config.h"
#include <string.h> /* strcmp */
#include "gtktypeutils.h"
#include "gtkintl.h"
GType
gtk_identifier_get_type (void)
{
static GType our_type = 0;
if (our_type == 0)
{
GTypeInfo tinfo = { 0, };
our_type = g_type_register_static (G_TYPE_STRING, I_("GtkIdentifier"), &tinfo, 0);
}
return our_type;
}

50
gtk/gtktypeutils.h
View File

@ -1,50 +0,0 @@
/* GTK - The GIMP Toolkit
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
/*
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#ifndef __GTK_TYPE_UTILS_H__
#define __GTK_TYPE_UTILS_H__
/* enum types generated by glib-mkenums
*/
#include <gtk/gtktypebuiltins.h>
G_BEGIN_DECLS
/* urg */
#define GTK_TYPE_IDENTIFIER (gtk_identifier_get_type ())
GType gtk_identifier_get_type (void) G_GNUC_CONST;
typedef gchar * (*GtkTranslateFunc) (const gchar *path,
gpointer func_data);
G_END_DECLS
#endif /* __GTK_TYPE_UTILS_H__ */

1
gtk/gtkwidget.c
View File

@ -63,6 +63,7 @@
#include "gtkmodifierstyle.h" #include "gtkmodifierstyle.h"
#include "gtkversion.h" #include "gtkversion.h"
#include "gtkdebug.h" #include "gtkdebug.h"
#include "gtktypebuiltins.h"
/** /**

5
gtk/gtkwindow.c
View File

@ -26,7 +26,7 @@
#include "config.h" #include "config.h"
#include "gtkintl.h" #include "gtkwindow.h"
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
@ -35,7 +35,6 @@
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkrc.h" #include "gtkrc.h"
#include "gtkwindow.h"
#include "gtkwindowprivate.h" #include "gtkwindowprivate.h"
#include "gtkaccelgroupprivate.h" #include "gtkaccelgroupprivate.h"
#include "gtkbindings.h" #include "gtkbindings.h"
@ -49,6 +48,8 @@
#include "gtkplug.h" #include "gtkplug.h"
#include "gtkbuildable.h" #include "gtkbuildable.h"
#include "gtkwidgetprivate.h" #include "gtkwidgetprivate.h"
#include "gtkintl.h"
#include "gtktypebuiltins.h"
#ifdef GDK_WINDOWING_X11 #ifdef GDK_WINDOWING_X11
#include "x11/gdkx.h" #include "x11/gdkx.h"

1
po-properties/POTFILES.in
View File

@ -197,7 +197,6 @@ gtk/gtktreesortable.c
gtk/gtktreestore.c gtk/gtktreestore.c
gtk/gtktreeview.c gtk/gtktreeview.c
gtk/gtktreeviewcolumn.c gtk/gtktreeviewcolumn.c
gtk/gtktypeutils.c
gtk/gtkuimanager.c gtk/gtkuimanager.c
gtk/gtkvbbox.c gtk/gtkvbbox.c
gtk/gtkvbox.c gtk/gtkvbox.c

1
po/POTFILES.in
View File

@ -198,7 +198,6 @@ gtk/gtktreesortable.c
gtk/gtktreestore.c gtk/gtktreestore.c
gtk/gtktreeview.c gtk/gtktreeview.c
gtk/gtktreeviewcolumn.c gtk/gtktreeviewcolumn.c
gtk/gtktypeutils.c
gtk/gtkuimanager.c gtk/gtkuimanager.c
gtk/gtkvbbox.c gtk/gtkvbbox.c
gtk/gtkvbox.c gtk/gtkvbox.c