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

End the search if the window is closed.

Browse Source 
* demos/gtk-demo/search_entry.c: End the search if the window
        is closed.

        * demos/gtk-demo/search_entry.c:
        * demos/gtk-demo/entry_completion.c: Group the entry examples
        under "Entry".


svn path=/trunk/; revision=22132
This commit is contained in:
Matthias Clasen
2009-01-18 15:50:29 +00:00
parent c0a02a9f99
commit ade90af533
3 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2009-01-18 Matthias Clasen <mclasen@redhat.com>
* demos/gtk-demo/search_entry.c: End the search if the window
is closed.
* demos/gtk-demo/search_entry.c:
* demos/gtk-demo/entry_completion.c: Group the entry examples
under "Entry".
2009-01-18 Christian Dywan <christian@twotoasts.de> 2009-01-18 Christian Dywan <christian@twotoasts.de>
Remove a redundant include from gtktoolbar.c Remove a redundant include from gtktoolbar.c

2
demos/gtk-demo/entry_completion.c
View File

@ -1,4 +1,4 @@
/* Entry Completion /* Entry/Entry Completion
* *
* GtkEntryCompletion provides a mechanism for adding support for * GtkEntryCompletion provides a mechanism for adding support for
* completion in GtkEntry. * completion in GtkEntry.

17
demos/gtk-demo/search_entry.c
View File

@ -1,4 +1,4 @@
/* Search Entry /* Entry/Search Entry
* *
* GtkEntry allows to display icons and progress information. * GtkEntry allows to display icons and progress information.
* This demo shows how to use these features in a search entry. * This demo shows how to use these features in a search entry.
@ -152,6 +152,19 @@ search_by_file (GtkWidget *item,
"Search by file name\n" "Search by file name\n"
"Click here to change the search type"); "Click here to change the search type");
} }
static void
search_entry_destroyed (GtkWidget *widget)
{
if (finish_search_id != 0)
g_source_remove (finish_search_id);
if (search_progress_id != 0)
g_source_remove (search_progress_id);
window = NULL;
}
GtkWidget * GtkWidget *
do_search_entry (GtkWidget *do_widget) do_search_entry (GtkWidget *do_widget)
@ -178,7 +191,7 @@ do_search_entry (GtkWidget *do_widget)
g_signal_connect (window, "response", g_signal_connect (window, "response",
G_CALLBACK (gtk_widget_destroy), NULL); G_CALLBACK (gtk_widget_destroy), NULL);
g_signal_connect (window, "destroy", g_signal_connect (window, "destroy",
G_CALLBACK (gtk_widget_destroyed), &window); G_CALLBACK (search_entry_destroyed), &window);
vbox = gtk_vbox_new (FALSE, 5); vbox = gtk_vbox_new (FALSE, 5);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);