callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove all deprecated stuff from gtkmain

Browse Source
This commit is contained in:
Michael Natterer
2009-10-21 20:46:37 +02:00
committed by Javier Jardón
parent f25e1b0a47
commit f7813125bb
3 changed files with 0 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gtk/gtk.symbols
View File

@ -2077,19 +2077,6 @@ gtk_get_option_group
gtk_get_current_event gtk_get_current_event
gtk_get_current_event_state gtk_get_current_event_state
gtk_get_current_event_time gtk_get_current_event_time
#ifndef GTK_DISABLE_DEPRECATED
gtk_exit
gtk_idle_add
gtk_idle_add_full
gtk_idle_add_priority
gtk_idle_remove
gtk_idle_remove_by_data
gtk_timeout_add
gtk_timeout_add_full
gtk_timeout_remove
gtk_input_add_full
gtk_input_remove
#endif
gtk_false G_GNUC_CONST gtk_false G_GNUC_CONST
gtk_true G_GNUC_CONST gtk_true G_GNUC_CONST
gtk_events_pending gtk_events_pending

175
gtk/gtkmain.c
View File

@ -186,12 +186,6 @@ static void gtk_quit_destroy (GtkQuitFunction *quitf);
static gint gtk_invoke_key_snoopers (GtkWidget *grab_widget, static gint gtk_invoke_key_snoopers (GtkWidget *grab_widget,
GdkEvent *event); GdkEvent *event);
static void gtk_destroy_closure (gpointer data);
static gboolean gtk_invoke_idle_timeout (gpointer data);
static void gtk_invoke_input (gpointer data,
gint source,
GdkInputCondition condition);
#if 0 #if 0
static void gtk_error (gchar *str); static void gtk_error (gchar *str);
static void gtk_warning (gchar *str); static void gtk_warning (gchar *str);
@ -2076,175 +2070,6 @@ gtk_quit_remove_by_data (gpointer data)
} }
} }
guint
gtk_timeout_add_full (guint32 interval,
GtkFunction function,
GtkCallbackMarshal marshal,
gpointer data,
GDestroyNotify destroy)
{
if (marshal)
{
GtkClosure *closure;
closure = g_new (GtkClosure, 1);
closure->marshal = marshal;
closure->data = data;
closure->destroy = destroy;
return g_timeout_add_full (0, interval,
gtk_invoke_idle_timeout,
closure,
gtk_destroy_closure);
}
else
return g_timeout_add_full (0, interval, function, data, destroy);
}
guint
gtk_timeout_add (guint32 interval,
GtkFunction function,
gpointer data)
{
return g_timeout_add_full (0, interval, function, data, NULL);
}
void
gtk_timeout_remove (guint tag)
{
g_source_remove (tag);
}
guint
gtk_idle_add_full (gint priority,
GtkFunction function,
GtkCallbackMarshal marshal,
gpointer data,
GDestroyNotify destroy)
{
if (marshal)
{
GtkClosure *closure;
closure = g_new (GtkClosure, 1);
closure->marshal = marshal;
closure->data = data;
closure->destroy = destroy;
return g_idle_add_full (priority,
gtk_invoke_idle_timeout,
closure,
gtk_destroy_closure);
}
else
return g_idle_add_full (priority, function, data, destroy);
}
guint
gtk_idle_add (GtkFunction function,
gpointer data)
{
return g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, function, data, NULL);
}
guint
gtk_idle_add_priority (gint priority,
GtkFunction function,
gpointer data)
{
return g_idle_add_full (priority, function, data, NULL);
}
void
gtk_idle_remove (guint tag)
{
g_source_remove (tag);
}
void
gtk_idle_remove_by_data (gpointer data)
{
if (!g_idle_remove_by_data (data))
g_warning ("gtk_idle_remove_by_data(%p): no such idle", data);
}
guint
gtk_input_add_full (gint source,
GdkInputCondition condition,
GdkInputFunction function,
GtkCallbackMarshal marshal,
gpointer data,
GDestroyNotify destroy)
{
if (marshal)
{
GtkClosure *closure;
closure = g_new (GtkClosure, 1);
closure->marshal = marshal;
closure->data = data;
closure->destroy = destroy;
return gdk_input_add_full (source,
condition,
(GdkInputFunction) gtk_invoke_input,
closure,
(GDestroyNotify) gtk_destroy_closure);
}
else
return gdk_input_add_full (source, condition, function, data, destroy);
}
void
gtk_input_remove (guint tag)
{
g_source_remove (tag);
}
static void
gtk_destroy_closure (gpointer data)
{
GtkClosure *closure = data;
if (closure->destroy)
(closure->destroy) (closure->data);
g_free (closure);
}
static gboolean
gtk_invoke_idle_timeout (gpointer data)
{
GtkClosure *closure = data;
GtkArg args[1];
gint ret_val = FALSE;
args[0].name = NULL;
args[0].type = G_TYPE_BOOLEAN;
args[0].d.pointer_data = &ret_val;
closure->marshal (NULL, closure->data, 0, args);
return ret_val;
}
static void
gtk_invoke_input (gpointer data,
gint source,
GdkInputCondition condition)
{
GtkClosure *closure = data;
GtkArg args[3];
args[0].type = G_TYPE_INT;
args[0].name = NULL;
GTK_VALUE_INT (args[0]) = source;
args[1].type = GDK_TYPE_INPUT_CONDITION;
args[1].name = NULL;
GTK_VALUE_FLAGS (args[1]) = condition;
args[2].type = G_TYPE_NONE;
args[2].name = NULL;
closure->marshal (NULL, closure->data, 2, args);
}
/** /**
* gtk_get_current_event: * gtk_get_current_event:
* *

49
gtk/gtkmain.h
View File

@ -45,20 +45,6 @@ G_BEGIN_DECLS
*/ */
#define GTK_PRIORITY_RESIZE (G_PRIORITY_HIGH_IDLE + 10) #define GTK_PRIORITY_RESIZE (G_PRIORITY_HIGH_IDLE + 10)
#ifndef GTK_DISABLE_DEPRECATED
/* Use GDK_PRIORITY_REDRAW */
#define GTK_PRIORITY_REDRAW (G_PRIORITY_HIGH_IDLE + 20)
/* Deprecated. Use G_PRIORITY #define's instead
*/
#define GTK_PRIORITY_HIGH G_PRIORITY_HIGH
#define GTK_PRIORITY_INTERNAL GTK_PRIORITY_REDRAW
#define GTK_PRIORITY_DEFAULT G_PRIORITY_DEFAULT_IDLE
#define GTK_PRIORITY_LOW G_PRIORITY_LOW
#endif /* GTK_DISABLE_DEPRECATED */
typedef gint (*GtkKeySnoopFunc) (GtkWidget *grab_widget, typedef gint (*GtkKeySnoopFunc) (GtkWidget *grab_widget,
GdkEventKey *event, GdkEventKey *event,
gpointer func_data); gpointer func_data);
@ -127,10 +113,6 @@ gboolean gtk_init_check_abi_check (int *argc,
#endif #endif
#ifndef GTK_DISABLE_DEPRECATED
void gtk_exit (gint error_code);
#endif /* GTK_DISABLE_DEPRECATED */
void gtk_disable_setlocale (void); void gtk_disable_setlocale (void);
gchar * gtk_set_locale (void); gchar * gtk_set_locale (void);
PangoLanguage *gtk_get_default_language (void); PangoLanguage *gtk_get_default_language (void);
@ -170,37 +152,6 @@ guint gtk_quit_add_full (guint main_level,
GDestroyNotify destroy); GDestroyNotify destroy);
void gtk_quit_remove (guint quit_handler_id); void gtk_quit_remove (guint quit_handler_id);
void gtk_quit_remove_by_data (gpointer data); void gtk_quit_remove_by_data (gpointer data);
#ifndef GTK_DISABLE_DEPRECATED
guint gtk_timeout_add (guint32 interval,
GtkFunction function,
gpointer data);
guint gtk_timeout_add_full (guint32 interval,
GtkFunction function,
GtkCallbackMarshal marshal,
gpointer data,
GDestroyNotify destroy);
void gtk_timeout_remove (guint timeout_handler_id);
guint gtk_idle_add (GtkFunction function,
gpointer data);
guint gtk_idle_add_priority (gint priority,
GtkFunction function,
gpointer data);
guint gtk_idle_add_full (gint priority,
GtkFunction function,
GtkCallbackMarshal marshal,
gpointer data,
GDestroyNotify destroy);
void gtk_idle_remove (guint idle_handler_id);
void gtk_idle_remove_by_data (gpointer data);
guint gtk_input_add_full (gint source,
GdkInputCondition condition,
GdkInputFunction function,
GtkCallbackMarshal marshal,
gpointer data,
GDestroyNotify destroy);
void gtk_input_remove (guint input_handler_id);
#endif /* GTK_DISABLE_DEPRECATED */
guint gtk_key_snooper_install (GtkKeySnoopFunc snooper, guint gtk_key_snooper_install (GtkKeySnoopFunc snooper,
gpointer func_data); gpointer func_data);