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

Remove gtkmain stuff from docs and tutorial.

Browse Source 
Also, substitue the deprecated functions with the new ones in
documentation and in tests code
This commit is contained in:
Javier Jardón 2009-10-22 05:17:29 +02:00
parent f7813125bb
commit 20342702f4
8 changed files with 15 additions and 233 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
docs/reference/gtk/gtk-sections.txt
View File

@ -5882,7 +5882,6 @@ gtk_init
gtk_init_check
gtk_init_with_args
gtk_get_option_group
gtk_exit
gtk_events_pending
gtk_main
gtk_main_level
@ -5912,28 +5911,7 @@ gtk_quit_remove
gtk_quit_remove_by_data
<SUBSECTION>
gtk_timeout_add_full
gtk_timeout_add
gtk_timeout_remove
<SUBSECTION>
gtk_idle_add
gtk_idle_add_priority
gtk_idle_add_full
gtk_idle_remove
gtk_idle_remove_by_data
<SUBSECTION>
gtk_input_add_full
gtk_input_remove
<SUBSECTION>
GTK_PRIORITY_REDRAW
GTK_PRIORITY_RESIZE
GTK_PRIORITY_HIGH
GTK_PRIORITY_INTERNAL
GTK_PRIORITY_DEFAULT
GTK_PRIORITY_LOW
<SUBSECTION>
gtk_key_snooper_install

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

@ -162,18 +162,6 @@ functions such as g_signal_connect().
@Returns:
<!-- ##### FUNCTION gtk_exit ##### -->
<para>
Terminates the program and returns the given exit code to the caller.
This function will shut down the GUI and free all resources allocated
for GTK+.
</para>
@error_code: Return value to pass to the caller. This is dependent on the
target system but at least on Unix systems %0 means success.
@Deprecated: Use the standard exit() function instead.
<!-- ##### FUNCTION gtk_events_pending ##### -->
<para>
Checks if any events are pending. This can be used to update the GUI
@ -485,191 +473,14 @@ Removes a quit handler identified by its @data field.
@data: The pointer passed as @data to gtk_quit_add() or gtk_quit_add_full().
<!-- ##### FUNCTION gtk_timeout_add_full ##### -->
<para>
Registers a function to be called periodically. The function will be called
repeatedly after @interval milliseconds until it returns %FALSE at which
point the timeout is destroyed and will not be called again.
</para>
@interval: The time between calls to the function, in milliseconds
(1/1000ths of a second.)
@function: The function to call periodically.
@marshal: The marshaller to use instead of the function (if non-%NULL).
@data: The data to pass to the function.
@destroy: Function to call when the timeout is destroyed or %NULL.
@Returns: A unique id for the event source.
@Deprecated: 2.4: Use g_timeout_add_full() instead.
<!-- ##### FUNCTION gtk_timeout_add ##### -->
<para>
Registers a function to be called periodically. The function will be called
repeatedly after @interval milliseconds until it returns %FALSE at which
point the timeout is destroyed and will not be called again.
</para>
@interval: The time between calls to the function, in milliseconds
(1/1000ths of a second.)
@function: The function to call periodically.
@data: The data to pass to the function.
@Returns: A unique id for the event source.
@Deprecated: 2.4: Use g_timeout_add() instead.
<!-- ##### FUNCTION gtk_timeout_remove ##### -->
<para>
Removes the given timeout destroying all information about it.
</para>
@timeout_handler_id: The identifier returned when installing the timeout.
@Deprecated: 2.4: Use g_source_remove() instead.
<!-- ##### FUNCTION gtk_idle_add ##### -->
<para>
Causes the mainloop to call the given function whenever no events with
higher priority are to be processed. The default priority is
%GTK_PRIORITY_DEFAULT, which is rather low.
</para>
@function: The function to call.
@data: The information to pass to the function.
@Returns: a unique handle for this registration.
@Deprecated: 2.4: Use g_idle_add() instead.
<!-- ##### FUNCTION gtk_idle_add_priority ##### -->
<para>
Like gtk_idle_add() this function allows you to have a function called
when the event loop is idle. The difference is that you can give a
priority different from %GTK_PRIORITY_DEFAULT to the idle function.
</para>
@priority: The priority which should not be above %G_PRIORITY_HIGH_IDLE.
Note that you will interfere with GTK+ if you use a priority above
%GTK_PRIORITY_RESIZE.
@function: The function to call.
@data: Data to pass to that function.
@Returns: A unique id for the event source.
@Deprecated: 2.4: Use g_idle_add_full() instead.
<!-- ##### FUNCTION gtk_idle_add_full ##### -->
<para>
Like gtk_idle_add() this function allows you to have a function called
when the event loop is idle. The difference is that you can give a
priority different from %GTK_PRIORITY_DEFAULT to the idle function.
</para>
@priority: The priority which should not be above %G_PRIORITY_HIGH_IDLE.
Note that you will interfere with GTK+ if you use a priority above
%GTK_PRIORITY_RESIZE.
@function: The function to call.
@marshal: The marshaller to use instead of the function (if non-%NULL).
@data: Data to pass to that function.
@destroy: Function to call when the timeout is destroyed or %NULL.
@Returns: A unique id for the event source.
@Deprecated: 2.4: Use g_idle_add_full() instead.
<!-- ##### FUNCTION gtk_idle_remove ##### -->
<para>
Removes the idle function with the given id.
</para>
@idle_handler_id: Identifies the idle function to remove.
@Deprecated: 2.4: Use g_source_remove() instead.
<!-- ##### FUNCTION gtk_idle_remove_by_data ##### -->
<para>
Removes the idle function identified by the user data.
</para>
@data: remove the idle function which was registered with this user data.
@Deprecated: 2.4: Use g_idle_remove_by_data() instead.
<!-- ##### FUNCTION gtk_input_add_full ##### -->
<para>
Registers a function to be called when a condition becomes true
on a file descriptor.
</para>
@source: a file descriptor.
@condition: the condition.
@function: The function to call.
@marshal: The marshaller to use instead of the function (if non-%NULL).
@data: callback data passed to @function.
@destroy: callback function to call with @data when the input
handler is removed, or %NULL.
@Returns: A unique id for the event source; to be used with gtk_input_remove().
@Deprecated: 2.4: Use g_io_add_watch_full() instead.
<!-- ##### FUNCTION gtk_input_remove ##### -->
<para>
Removes the function with the given id.
</para>
@input_handler_id: Identifies the function to remove.
@Deprecated: 2.4: Use g_source_remove() instead.
<!-- ##### MACRO GTK_PRIORITY_REDRAW ##### -->
<para>
Use this priority for redrawing related stuff. It is used internally by
GTK+ to do pending redraws. This priority is lower than %GTK_PRIORITY_RESIZE
to avoid redrawing a widget just before resizing (and therefore redrawing
it again).
</para>
@Deprecated: 2.4: This macro is deprecated. You should use %GDK_PRIORITY_REDRAW instead.
<!-- ##### MACRO GTK_PRIORITY_RESIZE ##### -->
<para>
Use this priority for resizing related stuff. It is used internally by
GTK+ to compute the sizes of widgets. This priority is higher than
%GTK_PRIORITY_REDRAW to avoid resizing a widget which was just redrawn.
%GDK_PRIORITY_REDRAW to avoid resizing a widget which was just redrawn.
</para>
<!-- ##### MACRO GTK_PRIORITY_HIGH ##### -->
<para>
Use this for high priority timeouts. This priority is never used inside
GTK+ so everything running at this priority will be running before anything
inside the toolkit.
</para>
@Deprecated: 2.4: This macro is deprecated. You should use %G_PRIORITY_HIGH instead.
<!-- ##### MACRO GTK_PRIORITY_INTERNAL ##### -->
<para>
This priority is for GTK+ internal stuff. Don't use it in your applications.
</para>
<!-- ##### MACRO GTK_PRIORITY_DEFAULT ##### -->
<para>
Default priority for idle functions.
</para>
@Deprecated: 2.4: This macro is deprecated. You should use %G_PRIORITY_DEFAULT_IDLE instead.
<!-- ##### MACRO GTK_PRIORITY_LOW ##### -->
<para>
Priority for very unimportant background tasks.
</para>
@Deprecated: 2.4: This macro is deprecated. You should use %G_PRIORITY_LOW instead.
<!-- ##### FUNCTION gtk_key_snooper_install ##### -->
<para>
Installs a key snooper function, which will get called on all key events

8
docs/tutorial/gtk-tut.sgml
View File

@ -9374,20 +9374,20 @@ What if you have a function which you want to be called when nothing
else is happening ?</para>
<programlisting role="C">
gint gtk_idle_add( GtkFunction function,
gpointer data );
guint g_idle_add( GSourceFunc function,
gpointer data );
</programlisting>
<para>This causes GTK to call the specified function whenever nothing else
is happening.</para>
<programlisting role="C">
void gtk_idle_remove( gint tag );
void g_source_remove( guint tag );
</programlisting>
<para>I won't explain the meaning of the arguments as they follow very much
like the ones above. The function pointed to by the first argument to
gtk_idle_add will be called whenever the opportunity arises. As with
g_idle_add will be called whenever the opportunity arises. As with
the others, returning FALSE will stop the idle function from being
called.</para>

7
gtk/gtkmain.c
View File

@ -1063,13 +1063,6 @@ gtk_init_check_abi_check (int *argc, char ***argv, int num_checks, size_t sizeof
#endif
void
gtk_exit (gint errorcode)
{
exit (errorcode);
}
/**
* gtk_set_locale:
*

4
modules/other/gail/tests/testcombo.c
View File

@ -135,7 +135,7 @@ static void _check_combo_box (AtkObject *obj)
if (!done)
{
gtk_idle_add (_open_combo_list, obj);
g_idle_add ((GSourceFunc)_open_combo_list, obj);
done = TRUE;
}
else
@ -150,7 +150,7 @@ static gint _open_combo_list (gpointer data)
g_print ("_open_combo_list\n");
atk_action_do_action (ATK_ACTION (obj), 0);
gtk_timeout_add (5000, _close_combo_list, obj);
g_timeout_add (5000, _close_combo_list, obj);
return FALSE;
}

12
tests/testgtk.c
View File

@ -9847,7 +9847,7 @@ static void
destroy_progress (GtkWidget *widget,
ProgressData **pdata)
{
gtk_timeout_remove ((*pdata)->timer);
g_source_remove ((*pdata)->timer);
(*pdata)->timer = 0;
(*pdata)->window = NULL;
g_free (*pdata);
@ -10061,7 +10061,7 @@ create_progress_bar (GtkWidget *widget)
gtk_progress_set_format_string (GTK_PROGRESS (pdata->pbar),
"%v from [%l,%u] (=%p%%)");
gtk_container_add (GTK_CONTAINER (align), pdata->pbar);
pdata->timer = gtk_timeout_add (100, progress_timeout, pdata->pbar);
pdata->timer = g_timeout_add (100, (GSourceFunc)progress_timeout, pdata->pbar);
align = gtk_alignment_new (0.5, 0.5, 0, 0);
gtk_box_pack_start (GTK_BOX (vbox2), align, FALSE, FALSE, 5);
@ -11067,7 +11067,7 @@ start_timeout_test (GtkWidget *widget,
{
if (!timer)
{
timer = gtk_timeout_add (100, (GtkFunction) timeout_test, label);
timer = g_timeout_add (100, (GSourceFunc)timeout_test, label);
}
}
@ -11077,7 +11077,7 @@ stop_timeout_test (GtkWidget *widget,
{
if (timer)
{
gtk_timeout_remove (timer);
g_source_remove (timer);
timer = 0;
}
}
@ -11177,7 +11177,7 @@ start_idle_test (GtkWidget *widget,
{
if (!idle_id)
{
idle_id = gtk_idle_add ((GtkFunction) idle_test, label);
idle_id = g_idle_add ((GSourceFunc) idle_test, label);
}
}
@ -11187,7 +11187,7 @@ stop_idle_test (GtkWidget *widget,
{
if (idle_id)
{
gtk_idle_remove (idle_id);
g_source_remove (idle_id);
idle_id = 0;
}
}

2
tests/testselection.c
View File

@ -378,7 +378,7 @@ paste (GtkWidget *widget, GtkWidget *entry)
void
quit (void)
{
gtk_exit (0);
exit (0);
}
int

2
tests/testtext.c
View File

@ -472,7 +472,7 @@ fill_example_buffer (GtkTextBuffer *buffer)
tag = gtk_text_buffer_create_tag (buffer, "fg_blue", NULL);
#ifdef DO_BLINK
gtk_timeout_add (1000, blink_timeout, tag);
g_timeout_add (1000, (GSourceFunc)blink_timeout, tag);
#endif
setup_tag (tag);