summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHavoc Pennington <hp@pobox.com>2001-05-25 03:42:40 +0000
committerHavoc Pennington <hp@src.gnome.org>2001-05-25 03:42:40 +0000
commitb995aae44d144c9eb659437814aeb6afab58186c (patch)
tree5d7b15260f3ea9424d9e4b0b0e35c4828dae11cb
parent92afa2ecc4adf260fdd1154559fe6a198ad226ec (diff)
downloadgtk+-b995aae44d144c9eb659437814aeb6afab58186c.tar.gz
New function
2001-05-22 Havoc Pennington <hp@pobox.com> * gtk/gtkbin.c (gtk_bin_get_child): New function
-rw-r--r--ChangeLog4
-rw-r--r--ChangeLog.pre-2-04
-rw-r--r--ChangeLog.pre-2-104
-rw-r--r--ChangeLog.pre-2-24
-rw-r--r--ChangeLog.pre-2-44
-rw-r--r--ChangeLog.pre-2-64
-rw-r--r--ChangeLog.pre-2-84
-rw-r--r--docs/reference/ChangeLog4
-rw-r--r--docs/reference/gtk/gtk-sections.txt1
-rw-r--r--docs/reference/gtk/tmpl/gtk-unused.sgml6
-rw-r--r--docs/reference/gtk/tmpl/gtkbin.sgml9
-rw-r--r--docs/reference/gtk/tmpl/gtkfontsel.sgml15
-rw-r--r--docs/reference/gtk/tmpl/gtkrc.sgml1
-rw-r--r--docs/reference/gtk/tmpl/gtktextview.sgml7
-rw-r--r--docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml1
-rw-r--r--gtk/gtkbin.c18
-rw-r--r--gtk/gtkbin.h1
17 files changed, 89 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8ab3a6d805..be86db83da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-22 Havoc Pennington <hp@pobox.com>
+
+ * gtk/gtkbin.c (gtk_bin_get_child): New function
+
Wed May 23 20:07:53 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontextsimple.c: Add Mode_Switch to list of keys
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 8ab3a6d805..be86db83da 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,7 @@
+2001-05-22 Havoc Pennington <hp@pobox.com>
+
+ * gtk/gtkbin.c (gtk_bin_get_child): New function
+
Wed May 23 20:07:53 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontextsimple.c: Add Mode_Switch to list of keys
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8ab3a6d805..be86db83da 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+2001-05-22 Havoc Pennington <hp@pobox.com>
+
+ * gtk/gtkbin.c (gtk_bin_get_child): New function
+
Wed May 23 20:07:53 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontextsimple.c: Add Mode_Switch to list of keys
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 8ab3a6d805..be86db83da 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+2001-05-22 Havoc Pennington <hp@pobox.com>
+
+ * gtk/gtkbin.c (gtk_bin_get_child): New function
+
Wed May 23 20:07:53 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontextsimple.c: Add Mode_Switch to list of keys
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 8ab3a6d805..be86db83da 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+2001-05-22 Havoc Pennington <hp@pobox.com>
+
+ * gtk/gtkbin.c (gtk_bin_get_child): New function
+
Wed May 23 20:07:53 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontextsimple.c: Add Mode_Switch to list of keys
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 8ab3a6d805..be86db83da 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+2001-05-22 Havoc Pennington <hp@pobox.com>
+
+ * gtk/gtkbin.c (gtk_bin_get_child): New function
+
Wed May 23 20:07:53 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontextsimple.c: Add Mode_Switch to list of keys
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 8ab3a6d805..be86db83da 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+2001-05-22 Havoc Pennington <hp@pobox.com>
+
+ * gtk/gtkbin.c (gtk_bin_get_child): New function
+
Wed May 23 20:07:53 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimcontextsimple.c: Add Mode_Switch to list of keys
diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 2faf697c7b..5eeb98b325 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-22 Havoc Pennington <hp@pobox.com>
+
+ * gtk/gtk-sections.txt: add gtk_bin_get_child
+
Fri May 18 12:28:08 2001 Owen Taylor <otaylor@redhat.com>
* gtk/tmpl/gtksizegroup.sgml gtk/gtk-sections.txt gtk/gtk.types:
diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt
index 4dfa32fc38..ff80a8b7c2 100644
--- a/docs/reference/gtk/gtk-sections.txt
+++ b/docs/reference/gtk/gtk-sections.txt
@@ -115,6 +115,7 @@ GTK_BUTTON_BOX_GET_CLASS
<FILE>gtkbin</FILE>
<TITLE>GtkBin</TITLE>
GtkBin
+gtk_bin_get_child
<SUBSECTION Standard>
GTK_BIN
GTK_IS_BIN
diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml
index f9c405430f..ec5c6e497b 100644
--- a/docs/reference/gtk/tmpl/gtk-unused.sgml
+++ b/docs/reference/gtk/tmpl/gtk-unused.sgml
@@ -747,6 +747,12 @@ produce superscript and subscript.
</para>
+<!-- ##### ARG GtkTextView:justify ##### -->
+<para>
+
+</para>
+
+
<!-- ##### ARG GtkVScale:adjustment ##### -->
<para>
the #GtkAdjustment which sets the range of the scale.
diff --git a/docs/reference/gtk/tmpl/gtkbin.sgml b/docs/reference/gtk/tmpl/gtkbin.sgml
index 400fc8e2b7..5a64c10bd2 100644
--- a/docs/reference/gtk/tmpl/gtkbin.sgml
+++ b/docs/reference/gtk/tmpl/gtkbin.sgml
@@ -40,3 +40,12 @@ an application.)
</para>
+<!-- ##### FUNCTION gtk_bin_get_child ##### -->
+<para>
+
+</para>
+
+@bin:
+@Returns:
+
+
diff --git a/docs/reference/gtk/tmpl/gtkfontsel.sgml b/docs/reference/gtk/tmpl/gtkfontsel.sgml
index 660ed1cd71..1c9b874d26 100644
--- a/docs/reference/gtk/tmpl/gtkfontsel.sgml
+++ b/docs/reference/gtk/tmpl/gtkfontsel.sgml
@@ -106,3 +106,18 @@ Sets the text displayed in the preview area.
@text: the text to display in the preview area.
+<!-- ##### ARG GtkFontSelection:font-name ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkFontSelection:font ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkFontSelection:preview-text ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtkrc.sgml b/docs/reference/gtk/tmpl/gtkrc.sgml
index aeceb3e5ec..88a0a4a507 100644
--- a/docs/reference/gtk/tmpl/gtkrc.sgml
+++ b/docs/reference/gtk/tmpl/gtkrc.sgml
@@ -495,6 +495,7 @@ This can later be composited together with other
#GtkRcStyle structures to form a #GtkStyle.
</para>
+@parent_instance:
@name:
@bg_pixmap_name:
@font_desc:
diff --git a/docs/reference/gtk/tmpl/gtktextview.sgml b/docs/reference/gtk/tmpl/gtktextview.sgml
index e4b5b21462..3be7141f8f 100644
--- a/docs/reference/gtk/tmpl/gtktextview.sgml
+++ b/docs/reference/gtk/tmpl/gtktextview.sgml
@@ -665,7 +665,7 @@ types related to the text widget and how they work together.
</para>
-<!-- ##### ARG GtkTextView:justify ##### -->
+<!-- ##### ARG GtkTextView:justification ##### -->
<para>
</para>
@@ -690,3 +690,8 @@ types related to the text widget and how they work together.
</para>
+<!-- ##### ARG GtkTextView:cursor-visible ##### -->
+<para>
+
+</para>
+
diff --git a/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml b/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml
index 768a600491..76a41e6f45 100644
--- a/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml
+++ b/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml
@@ -35,7 +35,6 @@ GtkTreeViewColumn
@window:
@xalign:
@property_changed_signal:
-@clickable_signal:
@width:
@requested_width:
@min_width:
diff --git a/gtk/gtkbin.c b/gtk/gtkbin.c
index 315819835b..bd18758ffa 100644
--- a/gtk/gtkbin.c
+++ b/gtk/gtkbin.c
@@ -232,3 +232,21 @@ gtk_bin_forall (GtkContainer *container,
if (bin->child)
(* callback) (bin->child, callback_data);
}
+
+/**
+ * gtk_bin_get_child:
+ * @bin: a #GtkBin
+ *
+ * Gets the child of the #GtkBin, or %NULL if the bin contains
+ * no child widget. The returned widget does not have a reference
+ * added, so you do not need to unref it.
+ *
+ * Return value: pointer to child of the #GtkBin
+ **/
+GtkWidget*
+gtk_bin_get_child (GtkBin *bin)
+{
+ g_return_val_if_fail (GTK_IS_BIN (bin), NULL);
+
+ return bin->child;
+}
diff --git a/gtk/gtkbin.h b/gtk/gtkbin.h
index 4d24c086d2..3b914013f5 100644
--- a/gtk/gtkbin.h
+++ b/gtk/gtkbin.h
@@ -63,6 +63,7 @@ struct _GtkBinClass
GtkType gtk_bin_get_type (void) G_GNUC_CONST;
+GtkWidget *gtk_bin_get_child (GtkBin *bin);
#ifdef __cplusplus
}