AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-11 21:20:09 +00:00
Code Issues Projects Releases Wiki Activity

minor fixes

Browse Source 
Sat Dec  7 14:45:50 GMT 2002  Tony Gale <gale@gtk.org>

        * docs/tutorial/gtk-tut.sgml: minor fixes

        * examples/pixmap: don't use deprecated function
This commit is contained in:
GMT 2002 Tony Gale 2002-12-07 14:48:08 +00:00 committed by Tony Gale
parent 105434ae4f
commit 47ebb9739a
9 changed files with 51 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Sat Dec 7 14:45:50 GMT 2002 Tony Gale <gale@gtk.org>
* docs/tutorial/gtk-tut.sgml: minor fixes
* examples/pixmap: don't use deprecated function
Fri Dec 6 19:00:59 2002 Owen Taylor <otaylor@redhat.com> Fri Dec 6 19:00:59 2002 Owen Taylor <otaylor@redhat.com>
* demos/gtk-demo/testview.c tests/testgtk.c * demos/gtk-demo/testview.c tests/testgtk.c

6
ChangeLog.pre-2-10
View File

@ -1,3 +1,9 @@
Sat Dec 7 14:45:50 GMT 2002 Tony Gale <gale@gtk.org>
* docs/tutorial/gtk-tut.sgml: minor fixes
* examples/pixmap: don't use deprecated function
Fri Dec 6 19:00:59 2002 Owen Taylor <otaylor@redhat.com> Fri Dec 6 19:00:59 2002 Owen Taylor <otaylor@redhat.com>
* demos/gtk-demo/testview.c tests/testgtk.c * demos/gtk-demo/testview.c tests/testgtk.c

6
ChangeLog.pre-2-2
View File

@ -1,3 +1,9 @@
Sat Dec 7 14:45:50 GMT 2002 Tony Gale <gale@gtk.org>
* docs/tutorial/gtk-tut.sgml: minor fixes
* examples/pixmap: don't use deprecated function
Fri Dec 6 19:00:59 2002 Owen Taylor <otaylor@redhat.com> Fri Dec 6 19:00:59 2002 Owen Taylor <otaylor@redhat.com>
* demos/gtk-demo/testview.c tests/testgtk.c * demos/gtk-demo/testview.c tests/testgtk.c

6
ChangeLog.pre-2-4
View File

@ -1,3 +1,9 @@
Sat Dec 7 14:45:50 GMT 2002 Tony Gale <gale@gtk.org>
* docs/tutorial/gtk-tut.sgml: minor fixes
* examples/pixmap: don't use deprecated function
Fri Dec 6 19:00:59 2002 Owen Taylor <otaylor@redhat.com> Fri Dec 6 19:00:59 2002 Owen Taylor <otaylor@redhat.com>
* demos/gtk-demo/testview.c tests/testgtk.c * demos/gtk-demo/testview.c tests/testgtk.c

6
ChangeLog.pre-2-6
View File

@ -1,3 +1,9 @@
Sat Dec 7 14:45:50 GMT 2002 Tony Gale <gale@gtk.org>
* docs/tutorial/gtk-tut.sgml: minor fixes
* examples/pixmap: don't use deprecated function
Fri Dec 6 19:00:59 2002 Owen Taylor <otaylor@redhat.com> Fri Dec 6 19:00:59 2002 Owen Taylor <otaylor@redhat.com>
* demos/gtk-demo/testview.c tests/testgtk.c * demos/gtk-demo/testview.c tests/testgtk.c

6
ChangeLog.pre-2-8
View File

@ -1,3 +1,9 @@
Sat Dec 7 14:45:50 GMT 2002 Tony Gale <gale@gtk.org>
* docs/tutorial/gtk-tut.sgml: minor fixes
* examples/pixmap: don't use deprecated function
Fri Dec 6 19:00:59 2002 Owen Taylor <otaylor@redhat.com> Fri Dec 6 19:00:59 2002 Owen Taylor <otaylor@redhat.com>
* demos/gtk-demo/testview.c tests/testgtk.c * demos/gtk-demo/testview.c tests/testgtk.c

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

@ -5,7 +5,7 @@
<book id="gtk-tut"> <book id="gtk-tut">
<bookinfo> <bookinfo>
<date>October 27, 2002</date> <date>December 7, 2002</date>
<title>GTK+ 2.0 Tutorial</title> <title>GTK+ 2.0 Tutorial</title>
<authorgroup> <authorgroup>
<author> <author>
@ -34,13 +34,13 @@
<para>A copy of this tutorial in SGML and HTML is distributed with each <para>A copy of this tutorial in SGML and HTML is distributed with each
source code release of GTK+. For binary distributions, please check with source code release of GTK+. For binary distributions, please check with
you vendor.</para> your vendor.</para>
<para>A copy is available online for reference at <ulink <para>A copy is available online for reference at <ulink
url="http://www.gtk.org/tutorial">http://www.gtk.org/tutorial</ulink>.</para> url="http://www.gtk.org/tutorial/">http://www.gtk.org/tutorial</ulink>.</para>
<para>A packaged verion of this tutorial is available from <para>A packaged verion of this tutorial is available from
<ulink url="ftp://ftp.gtk.org/pub/gtk/tutorial"> <ulink url="ftp://ftp.gtk.org/pub/gtk/tutorial/">
ftp://ftp.gtk.org/pub/gtk/tutorial</ulink> which contains the tutorial in ftp://ftp.gtk.org/pub/gtk/tutorial</ulink> which contains the tutorial in
various different formats. This various different formats. This
package is primary for those people wanting to have the tutorial package is primary for those people wanting to have the tutorial
@ -1307,7 +1307,7 @@ it. Compile it yourself and play with it.</para>
<title>Packing Demonstration Program</title> <title>Packing Demonstration Program</title>
<programlisting role="C"> <programlisting role="C">
<!-- example-start packbox packbox.c --> /* example-start packbox packbox.c */
#include &lt;stdio.h&gt; #include &lt;stdio.h&gt;
#include &lt;stdlib.h&gt; #include &lt;stdlib.h&gt;
@ -8806,7 +8806,7 @@ static GtkItemFactoryEntry entries[] = {
{ "/File/tear1", NULL, NULL, 0, "&lt;Tearoff&gt;" }, { "/File/tear1", NULL, NULL, 0, "&lt;Tearoff&gt;" },
{ "/File/_New", "&lt;CTRL&gt;N", new_file, 1, "&lt;Item&gt;" }, { "/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/_Open...", "&lt;CTRL&gt;O", open_file, 1, "&lt;Item&gt;" },
{ "/File/sep1", NULL, NULL, 0, "&lt;Seperator&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;Item&gt;"} };
</programlisting> </programlisting>
</sect3> </sect3>
@ -8927,10 +8927,10 @@ section.</para>
<para>Here is an example using the GTK item factory.</para> <para>Here is an example using the GTK item factory.</para>
<programlisting role="C"> <programlisting role="C">
/* example-start menu itemfactory.c */ <!-- example-start menu itemfactory.c -->
#include &amp;lt;gtk/gtk.h&amp;gt; #include &lt;gtk/gtk.h&gt;
#include &amp;lt;strings.h&amp;gt; #include &lt;strings.h&gt;
/* Obligatory basic callback */ /* Obligatory basic callback */
static void print_hello( GtkWidget *w, static void print_hello( GtkWidget *w,

12
examples/pixmap/Makefile
View File

@ -1,13 +1,11 @@
CC = gcc CC = gcc
#CFLAGS = -Wall \ CFLAGS = -Wall \
# -DG_DISABLE_DEPRECATED \ -DG_DISABLE_DEPRECATED \
# -DGDK_DISABLE_DEPRECATED \ -DGDK_DISABLE_DEPRECATED \
# -DGDK_PIXBUF_DISABLE_DEPRECATED \ -DGDK_PIXBUF_DISABLE_DEPRECATED \
# -DGTK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
CFLAGS =
pixmap: pixmap.c pixmap: pixmap.c
$(CC) pixmap.c -o pixmap $(CFLAGS) `pkg-config gtk+-2.0 --cflags --libs` $(CC) pixmap.c -o pixmap $(CFLAGS) `pkg-config gtk+-2.0 --cflags --libs`

2
examples/pixmap/pixmap.c
View File

@ -69,7 +69,7 @@ int main( int argc,
(gchar **)xpm_data); (gchar **)xpm_data);
/* a pixmap widget to contain the pixmap */ /* a pixmap widget to contain the pixmap */
pixmapwid = gtk_pixmap_new (pixmap, mask); pixmapwid = gtk_image_new_from_pixmap (pixmap, mask);
gtk_widget_show (pixmapwid); gtk_widget_show (pixmapwid);
/* a button to contain the pixmap widget */ /* a button to contain the pixmap widget */