summaryrefslogtreecommitdiff
path: root/docs/reference/gobject
diff options
context:
space:
mode:
Diffstat (limited to 'docs/reference/gobject')
-rw-r--r--docs/reference/gobject/tut_gobject.xml2
-rw-r--r--docs/reference/gobject/tut_gsignal.xml12
-rw-r--r--docs/reference/gobject/tut_howto.xml4
-rw-r--r--docs/reference/gobject/tut_intro.xml2
-rw-r--r--docs/reference/gobject/tut_tools.xml4
5 files changed, 12 insertions, 12 deletions
diff --git a/docs/reference/gobject/tut_gobject.xml b/docs/reference/gobject/tut_gobject.xml
index 7754fec1e..53f38abb2 100644
--- a/docs/reference/gobject/tut_gobject.xml
+++ b/docs/reference/gobject/tut_gobject.xml
@@ -19,7 +19,7 @@
<listitem><para>Generic per-object properties with set/get function pairs</para></listitem>
<listitem><para>Easy use of signals</para></listitem>
</itemizedlist>
- All the GNOME libraries which use the GLib type system (like GTK+ and GStreamer)
+ All the GNOME libraries which use the GLib type system (like GTK and GStreamer)
inherit from <link linkend="GObject"><type>GObject</type></link> which is why it is important to understand
the details of how it works.
</para>
diff --git a/docs/reference/gobject/tut_gsignal.xml b/docs/reference/gobject/tut_gsignal.xml
index 5559673cb..d690d1690 100644
--- a/docs/reference/gobject/tut_gsignal.xml
+++ b/docs/reference/gobject/tut_gsignal.xml
@@ -10,7 +10,7 @@
<para>
Closures are central to the concept of asynchronous signal delivery
- which is widely used throughout GTK+ and GNOME applications. A closure is an
+ which is widely used throughout GTK and GNOME applications. A closure is an
abstraction, a generic representation of a callback. It is a small structure
which contains three objects:
<itemizedlist>
@@ -37,9 +37,9 @@ return_type function_callback (… , gpointer user_data);
<footnote><para>
In practice, closures sit at the boundary of language runtimes: if you are
writing Python code and one of your Python callbacks receives a signal from
- a GTK+ widget, the C code in GTK+ needs to execute your Python
- code. The closure invoked by the GTK+ object invokes the Python callback:
- it behaves as a normal C object for GTK+ and as a normal Python object for
+ a GTK widget, the C code in GTK needs to execute your Python
+ code. The closure invoked by the GTK object invokes the Python callback:
+ it behaves as a normal C object for GTK and as a normal Python object for
Python code.
</para></footnote>
The GObject library provides a simple <link linkend="GCClosure"><type>GCClosure</type></link> type which
@@ -179,8 +179,8 @@ g_cclosure_marshal_VOID__INT (GClosure *closure,
<para>
GObject's signals have nothing to do with standard UNIX signals: they connect
arbitrary application-specific events with any number of listeners.
- For example, in GTK+, every user event (keystroke or mouse move) is received
- from the windowing system and generates a GTK+ event in the form of a signal emission
+ For example, in GTK, every user event (keystroke or mouse move) is received
+ from the windowing system and generates a GTK event in the form of a signal emission
on the widget object instance.
</para>
diff --git a/docs/reference/gobject/tut_howto.xml b/docs/reference/gobject/tut_howto.xml
index 9bff49b56..82419239a 100644
--- a/docs/reference/gobject/tut_howto.xml
+++ b/docs/reference/gobject/tut_howto.xml
@@ -17,7 +17,7 @@
<para>
This chapter focuses on the implementation of a subtype of GObject, for
- example to create a custom class hierarchy, or to subclass a GTK+ widget.
+ example to create a custom class hierarchy, or to subclass a GTK widget.
</para>
<para>
@@ -55,7 +55,7 @@
<filename>viewer_file.c</filename>.</para></listitem>
<listitem><para>Do not separate the prefix from the typename:
<filename>viewerfile.h</filename> and <filename>viewerfile.c</filename>.
- (this is the convention used by GTK+)</para></listitem>
+ (this is the convention used by GTK)</para></listitem>
</itemizedlist>
Some people like the first two solutions better: it makes reading file
names easier for those with poor eyesight.
diff --git a/docs/reference/gobject/tut_intro.xml b/docs/reference/gobject/tut_intro.xml
index 7614bf013..87e8a4984 100644
--- a/docs/reference/gobject/tut_intro.xml
+++ b/docs/reference/gobject/tut_intro.xml
@@ -6,7 +6,7 @@
<title>Background</title>
<para>
- GObject, and its lower-level type system, GType, are used by GTK+ and most GNOME libraries to
+ GObject, and its lower-level type system, GType, are used by GTK and most GNOME libraries to
provide:
<itemizedlist>
<listitem><para>object-oriented C-based APIs and</para></listitem>
diff --git a/docs/reference/gobject/tut_tools.xml b/docs/reference/gobject/tut_tools.xml
index f1076e832..c56431eaa 100644
--- a/docs/reference/gobject/tut_tools.xml
+++ b/docs/reference/gobject/tut_tools.xml
@@ -62,7 +62,7 @@
Yet another tool that you may find helpful when working with
GObjects is <ulink
url="http://sourceforge.net/projects/g-inspector">G-Inspector</ulink>. It
- is able to display GLib/GTK+ objects and their properties.
+ is able to display GLib/GTK objects and their properties.
</para>
</chapter>
@@ -90,7 +90,7 @@ break g_object_unref if _object == 0xcafebabe
<chapter id="tools-gtkdoc">
<title>Writing API docs</title>
- <para>The API documentation for most of the GLib, GObject, GTK+ and GNOME
+ <para>The API documentation for most of the GLib, GObject, GTK and GNOME
libraries is built with a combination of complex tools. Typically, the part of
the documentation which describes the behavior of each function is extracted
from the specially-formatted source code comments by a tool named gtk-doc which