From 7cebc87dac3c7df95561ae689601e61e7128744f Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 14 Jan 2003 23:33:03 +0000 Subject: [PATCH] Add a to the itemfactory example. (#103211) 2003-01-15 Matthias Clasen * examples/menu/itemfactory.c: * docs/tutorial/gtk-tut.sgml: Add a to the itemfactory example. (#103211) --- ChangeLog | 8 +++++++- ChangeLog.pre-2-10 | 8 +++++++- ChangeLog.pre-2-4 | 8 +++++++- ChangeLog.pre-2-6 | 8 +++++++- ChangeLog.pre-2-8 | 8 +++++++- docs/tutorial/gtk-tut.sgml | 11 +++++++---- examples/menu/itemfactory.c | 2 +- 7 files changed, 43 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index d6e80395da..1b33453d2e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-01-15 Matthias Clasen + + * examples/menu/itemfactory.c: + * docs/tutorial/gtk-tut.sgml: Add a to the itemfactory + example. (#103211) + 2002-12-29 Murray Cumming Fixes #102168. @@ -75,7 +81,7 @@ Tue Jan 14 23:11:55 2002 Kristian Rietveld Tue Jan 14 20:58:44 2002 Kristian Rietveld * gtk/gtktreeview.c (invalite_last_column): split out actual column - invalidation into invalite_column(), + invalidation into invalidate_column(), (gtk_tree_view_size_allocate_columns): invalidate column if the new width is larger than the old width. (fixes #102890, reported by Alex Duggan). diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index d6e80395da..1b33453d2e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2003-01-15 Matthias Clasen + + * examples/menu/itemfactory.c: + * docs/tutorial/gtk-tut.sgml: Add a to the itemfactory + example. (#103211) + 2002-12-29 Murray Cumming Fixes #102168. @@ -75,7 +81,7 @@ Tue Jan 14 23:11:55 2002 Kristian Rietveld Tue Jan 14 20:58:44 2002 Kristian Rietveld * gtk/gtktreeview.c (invalite_last_column): split out actual column - invalidation into invalite_column(), + invalidation into invalidate_column(), (gtk_tree_view_size_allocate_columns): invalidate column if the new width is larger than the old width. (fixes #102890, reported by Alex Duggan). diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index d6e80395da..1b33453d2e 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +2003-01-15 Matthias Clasen + + * examples/menu/itemfactory.c: + * docs/tutorial/gtk-tut.sgml: Add a to the itemfactory + example. (#103211) + 2002-12-29 Murray Cumming Fixes #102168. @@ -75,7 +81,7 @@ Tue Jan 14 23:11:55 2002 Kristian Rietveld Tue Jan 14 20:58:44 2002 Kristian Rietveld * gtk/gtktreeview.c (invalite_last_column): split out actual column - invalidation into invalite_column(), + invalidation into invalidate_column(), (gtk_tree_view_size_allocate_columns): invalidate column if the new width is larger than the old width. (fixes #102890, reported by Alex Duggan). diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index d6e80395da..1b33453d2e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2003-01-15 Matthias Clasen + + * examples/menu/itemfactory.c: + * docs/tutorial/gtk-tut.sgml: Add a to the itemfactory + example. (#103211) + 2002-12-29 Murray Cumming Fixes #102168. @@ -75,7 +81,7 @@ Tue Jan 14 23:11:55 2002 Kristian Rietveld Tue Jan 14 20:58:44 2002 Kristian Rietveld * gtk/gtktreeview.c (invalite_last_column): split out actual column - invalidation into invalite_column(), + invalidation into invalidate_column(), (gtk_tree_view_size_allocate_columns): invalidate column if the new width is larger than the old width. (fixes #102890, reported by Alex Duggan). diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index d6e80395da..1b33453d2e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2003-01-15 Matthias Clasen + + * examples/menu/itemfactory.c: + * docs/tutorial/gtk-tut.sgml: Add a to the itemfactory + example. (#103211) + 2002-12-29 Murray Cumming Fixes #102168. @@ -75,7 +81,7 @@ Tue Jan 14 23:11:55 2002 Kristian Rietveld Tue Jan 14 20:58:44 2002 Kristian Rietveld * gtk/gtktreeview.c (invalite_last_column): split out actual column - invalidation into invalite_column(), + invalidation into invalidate_column(), (gtk_tree_view_size_allocate_columns): invalidate column if the new width is larger than the old width. (fixes #102890, reported by Alex Duggan). diff --git a/docs/tutorial/gtk-tut.sgml b/docs/tutorial/gtk-tut.sgml index 1e5a5d2a8c..5f709ea040 100755 --- a/docs/tutorial/gtk-tut.sgml +++ b/docs/tutorial/gtk-tut.sgml @@ -5,7 +5,7 @@ - December 7, 2002 + January 15, 2003 GTK+ 2.0 Tutorial @@ -8682,6 +8682,9 @@ NULL or "" or "<Item>" - create a simple item "<Separator>" - create a separator "<Branch>" - create an item to hold submenus (optional) "<LastBranch>" - create a right justified branch +"<StockItem>" - create a simple item with a stock image. + see gtkstock.h for builtin stock items + Note that <LastBranch> is only useful for one submenu of @@ -8807,7 +8810,7 @@ static GtkItemFactoryEntry entries[] = { { "/File/_New", "<CTRL>N", new_file, 1, "<Item>" }, { "/File/_Open...", "<CTRL>O", open_file, 1, "<Item>" }, { "/File/sep1", NULL, NULL, 0, "<Separator>" }, - { "/File/_Quit", "<CTRL>Q", quit_program, 0, "<Item>"} }; + { "/File/_Quit", "<CTRL>Q", quit_program, 0, "<StockItem>", GTK_STOCK_QUIT } }; @@ -8965,7 +8968,7 @@ static GtkItemFactoryEntry menu_items[] = { { "/File/_Save", "&lt;control&gt;S", print_hello, 0, "<Item>" }, { "/File/Save _As", NULL, NULL, 0, "<Item>" }, { "/File/sep1", NULL, NULL, 0, "&lt;Separator&gt;" }, - { "/File/Quit", "&lt;control&gt;Q", gtk_main_quit, 0, "<Item>" }, + { "/File/_Quit", "<CTRL>Q", gtk_main_quit, 0, "<StockItem>", GTK_STOCK_QUIT }, { "/_Options", NULL, NULL, 0, "&lt;Branch&gt;" }, { "/Options/tear", NULL, NULL, 0, "&lt;Tearoff&gt;" }, { "/Options/Check", NULL, print_toggle, 1, "&lt;CheckItem&gt;" }, @@ -9103,7 +9106,7 @@ int main( int argc, return(0); } -/* example-end */ + diff --git a/examples/menu/itemfactory.c b/examples/menu/itemfactory.c index c4559c2275..05923101b2 100644 --- a/examples/menu/itemfactory.c +++ b/examples/menu/itemfactory.c @@ -35,7 +35,7 @@ static GtkItemFactoryEntry menu_items[] = { { "/File/_Save", "S", print_hello, 0, "" }, { "/File/Save _As", NULL, NULL, 0, "" }, { "/File/sep1", NULL, NULL, 0, "" }, - { "/File/Quit", "Q", gtk_main_quit, 0, "" }, + { "/File/_Quit", "Q", gtk_main_quit, 0, "", GTK_STOCK_QUIT }, { "/_Options", NULL, NULL, 0, "" }, { "/Options/tear", NULL, NULL, 0, "" }, { "/Options/Check", NULL, print_toggle, 1, "" },