Add a <StockItem> to the itemfactory example. (#103211)

2003-01-15  Matthias Clasen  <maclas@gmx.de>

	* examples/menu/itemfactory.c:
	* docs/tutorial/gtk-tut.sgml: Add a <StockItem> to the itemfactory
	example.  (#103211)

diff --git a/ChangeLog b/ChangeLog
index d6e80395da7b39c88c307ec86b8ce68f8d3250d8..1b33453d2e09635525b271e747ea5df7a37cd794 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-01-15  Matthias Clasen  <maclas@gmx.de>
+
+       * examples/menu/itemfactory.c: 
+       * docs/tutorial/gtk-tut.sgml: Add a <StockItem> to the itemfactory
+       example.  (#103211)
+
 2002-12-29  Murray Cumming  <murrayc@usa.net>
 
        Fixes #102168.
@@ -75,7 +81,7 @@ Tue Jan 14 23:11:55 2002  Kristian Rietveld  <kris@gtk.org>
 Tue Jan 14 20:58:44 2002  Kristian Rietveld  <kris@gtk.org>
 
        * 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 d6e80395da7b39c88c307ec86b8ce68f8d3250d8..1b33453d2e09635525b271e747ea5df7a37cd794 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2003-01-15  Matthias Clasen  <maclas@gmx.de>
+
+       * examples/menu/itemfactory.c: 
+       * docs/tutorial/gtk-tut.sgml: Add a <StockItem> to the itemfactory
+       example.  (#103211)
+
 2002-12-29  Murray Cumming  <murrayc@usa.net>
 
        Fixes #102168.
@@ -75,7 +81,7 @@ Tue Jan 14 23:11:55 2002  Kristian Rietveld  <kris@gtk.org>
 Tue Jan 14 20:58:44 2002  Kristian Rietveld  <kris@gtk.org>
 
        * 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 d6e80395da7b39c88c307ec86b8ce68f8d3250d8..1b33453d2e09635525b271e747ea5df7a37cd794 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2003-01-15  Matthias Clasen  <maclas@gmx.de>
+
+       * examples/menu/itemfactory.c: 
+       * docs/tutorial/gtk-tut.sgml: Add a <StockItem> to the itemfactory
+       example.  (#103211)
+
 2002-12-29  Murray Cumming  <murrayc@usa.net>
 
        Fixes #102168.
@@ -75,7 +81,7 @@ Tue Jan 14 23:11:55 2002  Kristian Rietveld  <kris@gtk.org>
 Tue Jan 14 20:58:44 2002  Kristian Rietveld  <kris@gtk.org>
 
        * 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 d6e80395da7b39c88c307ec86b8ce68f8d3250d8..1b33453d2e09635525b271e747ea5df7a37cd794 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2003-01-15  Matthias Clasen  <maclas@gmx.de>
+
+       * examples/menu/itemfactory.c: 
+       * docs/tutorial/gtk-tut.sgml: Add a <StockItem> to the itemfactory
+       example.  (#103211)
+
 2002-12-29  Murray Cumming  <murrayc@usa.net>
 
        Fixes #102168.
@@ -75,7 +81,7 @@ Tue Jan 14 23:11:55 2002  Kristian Rietveld  <kris@gtk.org>
 Tue Jan 14 20:58:44 2002  Kristian Rietveld  <kris@gtk.org>
 
        * 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 d6e80395da7b39c88c307ec86b8ce68f8d3250d8..1b33453d2e09635525b271e747ea5df7a37cd794 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2003-01-15  Matthias Clasen  <maclas@gmx.de>
+
+       * examples/menu/itemfactory.c: 
+       * docs/tutorial/gtk-tut.sgml: Add a <StockItem> to the itemfactory
+       example.  (#103211)
+
 2002-12-29  Murray Cumming  <murrayc@usa.net>
 
        Fixes #102168.
@@ -75,7 +81,7 @@ Tue Jan 14 23:11:55 2002  Kristian Rietveld  <kris@gtk.org>
 Tue Jan 14 20:58:44 2002  Kristian Rietveld  <kris@gtk.org>
 
        * 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 1e5a5d2a8cc2b7b23577c1c141a8c252f8bcb3df..5f709ea04054b9903422ca21d80f219419643bcd 100755 (executable)
--- a/docs/tutorial/gtk-tut.sgml
+++ b/docs/tutorial/gtk-tut.sgml
@@ -5,7 +5,7 @@
 <book id="gtk-tut">
 
 <bookinfo>
-    <date>December 7, 2002</date>
+    <date>January 15, 2003</date>
     <title>GTK+ 2.0 Tutorial</title>
     <authorgroup>
       <author>
@@ -8682,6 +8682,9 @@ NULL or "" or "&lt;Item&gt;" - create a simple item
 "&lt;Separator&gt;"          - create a separator
 "&lt;Branch&gt;"             - create an item to hold submenus (optional)
 "&lt;LastBranch&gt;"         - create a right justified branch
+"&lt;StockItem&gt;"          - create a simple item with a stock image. 
+                               see <filename>gtkstock.h</filename> for builtin stock items
+ 
 </programlisting>
 
 <para>Note that &lt;LastBranch&gt; is only useful for one submenu of
@@ -8807,7 +8810,7 @@ static GtkItemFactoryEntry entries[] = {
   { "/File/_New",     "&lt;CTRL&gt;N", new_file,     1, "&lt;Item&gt;" },
   { "/File/_Open...", "&lt;CTRL&gt;O", open_file,    1, "&lt;Item&gt;" },
   { "/File/sep1",     NULL,      NULL,         0, "&lt;Separator&gt;" },
-  { "/File/_Quit",    "&lt;CTRL&gt;Q", quit_program, 0, "&lt;Item&gt;"} };
+  { "/File/_Quit",    "&lt;CTRL&gt;Q", quit_program, 0, "&lt;StockItem&gt;", GTK_STOCK_QUIT } };
 </programlisting>
 </sect3>
 </sect2>
@@ -8965,7 +8968,7 @@ static GtkItemFactoryEntry menu_items[] = {
   { "/File/_Save",    "&amp;lt;control&amp;gt;S", print_hello,    0, "&lt;Item&gt;" },
   { "/File/Save _As", NULL,         NULL,           0, "&lt;Item&gt;" },
   { "/File/sep1",     NULL,         NULL,           0, "&amp;lt;Separator&amp;gt;" },
-  { "/File/Quit",     "&amp;lt;control&amp;gt;Q", gtk_main_quit,  0, "&lt;Item&gt;" },
+  { "/File/_Quit",    "&lt;CTRL&gt;Q", gtk_main_quit, 0, "&lt;StockItem&gt;", GTK_STOCK_QUIT },
   { "/_Options",      NULL,         NULL,           0, "&amp;lt;Branch&amp;gt;" },
   { "/Options/tear",  NULL,         NULL,           0, "&amp;lt;Tearoff&amp;gt;" },
   { "/Options/Check", NULL,         print_toggle,   1, "&amp;lt;CheckItem&amp;gt;" },
@@ -9103,7 +9106,7 @@ int main( int argc,
  
   return(0);
 }
-/* example-end */
+<!-- example-end -->
 </programlisting>
 
 </sect1>

diff --git a/examples/menu/itemfactory.c b/examples/menu/itemfactory.c
index c4559c227553ddc3c90534b241f962cfdb8cab1a..05923101b2a18ed5dea6cbb2bab7821269ddb0f2 100644 (file)
--- a/examples/menu/itemfactory.c
+++ b/examples/menu/itemfactory.c
@@ -35,7 +35,7 @@ static GtkItemFactoryEntry menu_items[] = {
   { "/File/_Save",    "<control>S", print_hello,    0, "<Item>" },
   { "/File/Save _As", NULL,         NULL,           0, "<Item>" },
   { "/File/sep1",     NULL,         NULL,           0, "<Separator>" },
-  { "/File/Quit",     "<control>Q", gtk_main_quit,  0, "<Item>" },
+  { "/File/_Quit",    "<CTRL>Q", gtk_main_quit, 0, "<StockItem>", GTK_STOCK_QUIT },
   { "/_Options",      NULL,         NULL,           0, "<Branch>" },
   { "/Options/tear",  NULL,         NULL,           0, "<Tearoff>" },
   { "/Options/Check", NULL,         print_toggle,   1, "<CheckItem>" },