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

gtkmain: Remove deprecated gtk_init_add() function

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=629955
This commit is contained in:
Javier Jardón
2010-10-13 03:05:22 +02:00
parent 77d6bd12b9
commit 70d95f04e7
5 changed files with 0 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5202,7 +5202,6 @@ gtk_device_grab_remove
<SUBSECTION> <SUBSECTION>
GtkFunction GtkFunction
gtk_init_add
gtk_quit_add_destroy gtk_quit_add_destroy
gtk_quit_add gtk_quit_add
GtkCallbackMarshal GtkCallbackMarshal

10
docs/reference/gtk/tmpl/gtkmain.sgml
View File

@ -439,16 +439,6 @@ If @widget does not have the grab, this function does nothing.
@Returns: @Returns:
<!-- ##### FUNCTION gtk_init_add ##### -->
<para>
Registers a function to be called when the mainloop is started.
</para>
@function: Function to invoke when gtk_main() is called next.
@data: Data to pass to that function.
@Deprecated: This function is going to be removed in GTK+ 3.0
<!-- ##### FUNCTION gtk_quit_add_destroy ##### --> <!-- ##### FUNCTION gtk_quit_add_destroy ##### -->
<para> <para>
Trigger destruction of @object in case the mainloop at level @main_level Trigger destruction of @object in case the mainloop at level @main_level

1
gtk/gtk.symbols
View File

@ -1878,7 +1878,6 @@ gtk_init
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
gtk_init_abi_check gtk_init_abi_check
#endif #endif
gtk_init_add
gtk_init_check gtk_init_check
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
gtk_init_check_abi_check gtk_init_check_abi_check

37
gtk/gtkmain.c
View File

@ -146,16 +146,9 @@ _gtk_get_localedir (void)
/* Private type definitions /* Private type definitions
*/ */
typedef struct _GtkInitFunction GtkInitFunction;
typedef struct _GtkQuitFunction GtkQuitFunction; typedef struct _GtkQuitFunction GtkQuitFunction;
typedef struct _GtkKeySnooperData GtkKeySnooperData; typedef struct _GtkKeySnooperData GtkKeySnooperData;
struct _GtkInitFunction
{
GtkFunction function;
gpointer data;
};
struct _GtkQuitFunction struct _GtkQuitFunction
{ {
guint id; guint id;
@ -187,8 +180,6 @@ static GList *current_events = NULL;
static GSList *main_loops = NULL; /* stack of currently executing main loops */ static GSList *main_loops = NULL; /* stack of currently executing main loops */
static GList *init_functions = NULL; /* A list of init functions.
*/
static GList *quit_functions = NULL; /* A list of quit functions. static GList *quit_functions = NULL; /* A list of quit functions.
*/ */
static GSList *key_snoopers = NULL; static GSList *key_snoopers = NULL;
@ -1293,8 +1284,6 @@ void
gtk_main (void) gtk_main (void)
{ {
GList *tmp_list; GList *tmp_list;
GList *functions;
GtkInitFunction *init;
GMainLoop *loop; GMainLoop *loop;
gtk_main_loop_level++; gtk_main_loop_level++;
@ -1302,19 +1291,6 @@ gtk_main (void)
loop = g_main_loop_new (NULL, TRUE); loop = g_main_loop_new (NULL, TRUE);
main_loops = g_slist_prepend (main_loops, loop); main_loops = g_slist_prepend (main_loops, loop);
tmp_list = functions = init_functions;
init_functions = NULL;
while (tmp_list)
{
init = tmp_list->data;
tmp_list = tmp_list->next;
(* init->function) (init->data);
g_free (init);
}
g_list_free (functions);
if (g_main_loop_is_running (main_loops->data)) if (g_main_loop_is_running (main_loops->data))
{ {
GDK_THREADS_LEAVE (); GDK_THREADS_LEAVE ();
@ -2132,19 +2108,6 @@ gtk_device_grab_remove (GtkWidget *widget,
gtk_grab_notify (group, device, widget, new_grab_widget, FALSE); gtk_grab_notify (group, device, widget, new_grab_widget, FALSE);
} }
void
gtk_init_add (GtkFunction function,
gpointer data)
{
GtkInitFunction *init;
init = g_new (GtkInitFunction, 1);
init->function = function;
init->data = data;
init_functions = g_list_prepend (init_functions, init);
}
guint guint
gtk_key_snooper_install (GtkKeySnoopFunc snooper, gtk_key_snooper_install (GtkKeySnoopFunc snooper,
gpointer func_data) gpointer func_data)

2
gtk/gtkmain.h
View File

@ -143,8 +143,6 @@ void gtk_device_grab_remove (GtkWidget *widget,
GdkDevice *device); GdkDevice *device);
#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION) #if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
void gtk_init_add (GtkFunction function,
gpointer data);
void gtk_quit_add_destroy (guint main_level, void gtk_quit_add_destroy (guint main_level,
GtkWidget *object); GtkWidget *object);
guint gtk_quit_add (guint main_level, guint gtk_quit_add (guint main_level,