summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHavoc Pennington <hp@pobox.com>2001-12-07 05:27:17 +0000
committerHavoc Pennington <hp@src.gnome.org>2001-12-07 05:27:17 +0000
commit6c98b1cb04e568edb1f855862bfa550fb3a0a4f8 (patch)
tree110822c8ceac65b36c1699a98313825bb80ddf4a
parentef3b6dbe71f114c090f34669fa2066116b11ee96 (diff)
downloadgtk+-6c98b1cb04e568edb1f855862bfa550fb3a0a4f8.tar.gz
fix up my list of "cursors that are actually useful" in gdk_cursor_new()
2001-12-07 Havoc Pennington <hp@pobox.com> * gdk/x11/gdkcursor-x11.c (gdk_cursor_new): fix up my list of "cursors that are actually useful" in gdk_cursor_new() docs
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-2-05
-rw-r--r--ChangeLog.pre-2-105
-rw-r--r--ChangeLog.pre-2-25
-rw-r--r--ChangeLog.pre-2-45
-rw-r--r--ChangeLog.pre-2-65
-rw-r--r--ChangeLog.pre-2-85
-rw-r--r--docs/reference/gdk/tmpl/cursors.sgml7
-rw-r--r--gdk/x11/gdkcursor-x11.c64
9 files changed, 92 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index 94d70b720f..7f6c5e0248 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-07 Havoc Pennington <hp@pobox.com>
+
+ * gdk/x11/gdkcursor-x11.c (gdk_cursor_new): fix up my list of
+ "cursors that are actually useful" in gdk_cursor_new() docs
+
Thu Dec 6 23:09:21 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtk[hv]paned.c (gtk_[hv]paned_size_allocate): Fix errors
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 94d70b720f..7f6c5e0248 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+2001-12-07 Havoc Pennington <hp@pobox.com>
+
+ * gdk/x11/gdkcursor-x11.c (gdk_cursor_new): fix up my list of
+ "cursors that are actually useful" in gdk_cursor_new() docs
+
Thu Dec 6 23:09:21 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtk[hv]paned.c (gtk_[hv]paned_size_allocate): Fix errors
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 94d70b720f..7f6c5e0248 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2001-12-07 Havoc Pennington <hp@pobox.com>
+
+ * gdk/x11/gdkcursor-x11.c (gdk_cursor_new): fix up my list of
+ "cursors that are actually useful" in gdk_cursor_new() docs
+
Thu Dec 6 23:09:21 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtk[hv]paned.c (gtk_[hv]paned_size_allocate): Fix errors
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 94d70b720f..7f6c5e0248 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2001-12-07 Havoc Pennington <hp@pobox.com>
+
+ * gdk/x11/gdkcursor-x11.c (gdk_cursor_new): fix up my list of
+ "cursors that are actually useful" in gdk_cursor_new() docs
+
Thu Dec 6 23:09:21 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtk[hv]paned.c (gtk_[hv]paned_size_allocate): Fix errors
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 94d70b720f..7f6c5e0248 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2001-12-07 Havoc Pennington <hp@pobox.com>
+
+ * gdk/x11/gdkcursor-x11.c (gdk_cursor_new): fix up my list of
+ "cursors that are actually useful" in gdk_cursor_new() docs
+
Thu Dec 6 23:09:21 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtk[hv]paned.c (gtk_[hv]paned_size_allocate): Fix errors
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 94d70b720f..7f6c5e0248 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2001-12-07 Havoc Pennington <hp@pobox.com>
+
+ * gdk/x11/gdkcursor-x11.c (gdk_cursor_new): fix up my list of
+ "cursors that are actually useful" in gdk_cursor_new() docs
+
Thu Dec 6 23:09:21 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtk[hv]paned.c (gtk_[hv]paned_size_allocate): Fix errors
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 94d70b720f..7f6c5e0248 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2001-12-07 Havoc Pennington <hp@pobox.com>
+
+ * gdk/x11/gdkcursor-x11.c (gdk_cursor_new): fix up my list of
+ "cursors that are actually useful" in gdk_cursor_new() docs
+
Thu Dec 6 23:09:21 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtk[hv]paned.c (gtk_[hv]paned_size_allocate): Fix errors
diff --git a/docs/reference/gdk/tmpl/cursors.sgml b/docs/reference/gdk/tmpl/cursors.sgml
index 31dd34d7f9..b575b4a81c 100644
--- a/docs/reference/gdk/tmpl/cursors.sgml
+++ b/docs/reference/gdk/tmpl/cursors.sgml
@@ -27,7 +27,6 @@ A <type>GdkCursor</type> structure represents a cursor.
The standard cursors available.
</para>
-
@GDK_X_CURSOR: <inlinegraphic format="png" fileref="X_cursor.png"></inlinegraphic>
@GDK_ARROW: <inlinegraphic format="png" fileref="arrow.png"></inlinegraphic>
@GDK_BASED_ARROW_DOWN: <inlinegraphic format="png" fileref="based_arrow_down.png"></inlinegraphic>
@@ -105,11 +104,10 @@ The standard cursors available.
@GDK_UR_ANGLE: <inlinegraphic format="png" fileref="ur_angle.png"></inlinegraphic>
@GDK_WATCH: <inlinegraphic format="png" fileref="watch.png"></inlinegraphic>
@GDK_XTERM: <inlinegraphic format="png" fileref="xterm.png"></inlinegraphic>
-@GDK_LAST_CURSOR:
+@GDK_LAST_CURSOR:
@GDK_CURSOR_IS_PIXMAP: type of cursors constructed with
gdk_cursor_new_from_pixmap().
-
<!-- ##### FUNCTION gdk_cursor_new ##### -->
<para>
@@ -123,7 +121,8 @@ The standard cursors available.
<para>
Creates a new cursor from a given pixmap and mask. Both the pixmap and mask
must have a depth of 1 (i.e. each pixel has only 2 values - on or off).
-The standard cursor size is 16 by 16 pixels.
+The standard cursor size is 16 by 16 pixels. You can create a bitmap
+from inline data as in the below example.
</para>
<example><title>Creating a custom cursor.</title>
<programlisting>
diff --git a/gdk/x11/gdkcursor-x11.c b/gdk/x11/gdkcursor-x11.c
index 3c024be839..de70775d53 100644
--- a/gdk/x11/gdkcursor-x11.c
+++ b/gdk/x11/gdkcursor-x11.c
@@ -37,16 +37,60 @@
* @cursor_type: cursor to create
*
* Creates a new cursor from the set of builtin cursors.
- * Some useful ones are: #GDK_RIGHT_PTR (right-facing arrow),
- * #GDK_CROSSHAIR (crosshair), #GDK_IBEAM (I-beam), #GDK_WATCH (busy),
- * #GDK_FLEUR (for moving objects), #GDK_HAND (a pointing hand),
- * #GDK_LEFT_SIDE (resize left side), #GDK_RIGHT_SIDE (resize right side),
- * #GDK_TOP_LEFT_CORNER (resize northwest corner), #GDK_TOP_RIGHT_CORNER (resize
- * northeast corner), #GDK_BOTTOM_LEFT_CORNER (resize southwest corner),
- * #GDK_BOTTOM_RIGHT_CORNER (resize southeast corner),
- * #GDK_TOP_SIDE (resize top side), #GDK_BOTTOM (resize bottom side),
- * #GDK_SB_H_DOUBLE_ARROW (move vertical splitter),
- * #GDK_SB_V_DOUBLE_ARROW (move horizontal splitter).
+ * Some useful ones are:
+ * <itemizedlist>
+ * <listitem><para>
+ * <inlinegraphic format="png" fileref="right_ptr.png"></inlinegraphic> #GDK_RIGHT_PTR (right-facing arrow)
+ * </para></listitem>
+ * <listitem><para>
+ * <inlinegraphic format="png" fileref="crosshair.png"></inlinegraphic> #GDK_CROSSHAIR (crosshair)
+ * </para></listitem>
+ * <listitem><para>
+ * <inlinegraphic format="png" fileref="xterm.png"></inlinegraphic> #GDK_XTERM (I-beam)
+ * </para></listitem>
+ * <listitem><para>
+ * <inlinegraphic format="png" fileref="watch.png"></inlinegraphic> #GDK_WATCH (busy)
+ * </para></listitem>
+ * <listitem><para>
+ * <inlinegraphic format="png" fileref="fleur.png"></inlinegraphic> #GDK_FLEUR (for moving objects)
+ * </para></listitem>
+ * <listitem><para>
+ * <inlinegraphic format="png" fileref="hand1.png"></inlinegraphic> #GDK_HAND1 (a right-pointing hand)
+ * </para></listitem>
+ * <listitem><para>
+ * <inlinegraphic format="png" fileref="hand2.png"></inlinegraphic> #GDK_HAND2 (a left-pointing hand)
+ * </para></listitem>
+ * <listitem><para>
+ * <inlinegraphic format="png" fileref="left_side.png"></inlinegraphic> #GDK_LEFT_SIDE (resize left side)
+ * </para></listitem>
+ * <listitem><para>
+ * <inlinegraphic format="png" fileref="right_side.png"></inlinegraphic> #GDK_RIGHT_SIDE (resize right side)
+ * </para></listitem>
+ * <listitem><para>
+ * <inlinegraphic format="png" fileref="top_left_corner.png"></inlinegraphic> #GDK_TOP_LEFT_CORNER (resize northwest corner)
+ * </para></listitem>
+ * <listitem><para>
+ * <inlinegraphic format="png" fileref="top_right_corner.png"></inlinegraphic> #GDK_TOP_RIGHT_CORNER (resize northeast corner)
+ * </para></listitem>
+ * <listitem><para>
+ * <inlinegraphic format="png" fileref="bottom_left_corner.png"></inlinegraphic> #GDK_BOTTOM_LEFT_CORNER (resize southwest corner)
+ * </para></listitem>
+ * <listitem><para>
+ * <inlinegraphic format="png" fileref="bottom_right_corner.png"></inlinegraphic> #GDK_BOTTOM_RIGHT_CORNER (resize southeast corner)
+ * </para></listitem>
+ * <listitem><para>
+ * <inlinegraphic format="png" fileref="top_side.png"></inlinegraphic> #GDK_TOP_SIDE (resize top side)
+ * </para></listitem>
+ * <listitem><para>
+ * <inlinegraphic format="png" fileref="bottom_side.png"></inlinegraphic> #GDK_BOTTOM_SIDE (resize bottom side)
+ * </para></listitem>
+ * <listitem><para>
+ * <inlinegraphic format="png" fileref="sb_h_double_arrow.png"></inlinegraphic> #GDK_SB_H_DOUBLE_ARROW (move vertical splitter)
+ * </para></listitem>
+ * <listitem><para>
+ * <inlinegraphic format="png" fileref="sb_v_double_arrow.png"></inlinegraphic> #GDK_SB_V_DOUBLE_ARROW (move horizontal splitter)
+ * </para></listitem>
+ * </itemizedlist>
*
* To make the cursor invisible, use gdk_cursor_new_from_pixmap() to create
* a cursor with no pixels in it.