summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--ChangeLog.pre-2-104
-rw-r--r--ChangeLog.pre-2-64
-rw-r--r--ChangeLog.pre-2-84
-rw-r--r--docs/reference/ChangeLog13
-rw-r--r--docs/reference/gtk/Makefile.am27
-rw-r--r--docs/reference/gtk/gtk.types2
-rw-r--r--docs/reference/gtk/images/accel-label.pngbin2264 -> 2676 bytes
-rw-r--r--docs/reference/gtk/images/button.pngbin2242 -> 1721 bytes
-rw-r--r--docs/reference/gtk/images/check-button.pngbin2200 -> 2523 bytes
-rw-r--r--docs/reference/gtk/images/color-button.pngbin2219 -> 2074 bytes
-rw-r--r--docs/reference/gtk/images/combo-box-entry.pngbin3056 -> 2743 bytes
-rw-r--r--docs/reference/gtk/images/entry.pngbin1490 -> 1567 bytes
-rw-r--r--docs/reference/gtk/images/file-button.pngbin2947 -> 8381 bytes
-rw-r--r--docs/reference/gtk/images/font-button.pngbin2653 -> 3148 bytes
-rw-r--r--docs/reference/gtk/images/frame.pngbin1882 -> 2032 bytes
-rw-r--r--docs/reference/gtk/images/icon-view.pngbin7737 -> 9672 bytes
-rw-r--r--docs/reference/gtk/images/image.pngbin2457 -> 4395 bytes
-rw-r--r--docs/reference/gtk/images/label.pngbin2083 -> 1481 bytes
-rw-r--r--docs/reference/gtk/images/list-and-tree.pngbin3425 -> 3858 bytes
-rw-r--r--docs/reference/gtk/images/menubar.pngbin2407 -> 2854 bytes
-rw-r--r--docs/reference/gtk/images/messagedialog.pngbin10139 -> 16107 bytes
-rw-r--r--docs/reference/gtk/images/multiline-text.pngbin2202 -> 2393 bytes
-rw-r--r--docs/reference/gtk/images/notebook.pngbin3844 -> 4449 bytes
-rw-r--r--docs/reference/gtk/images/panes.pngbin3247 -> 3715 bytes
-rw-r--r--docs/reference/gtk/images/progressbar.pngbin2804 -> 2425 bytes
-rw-r--r--docs/reference/gtk/images/radio-group.pngbin3684 -> 4312 bytes
-rw-r--r--docs/reference/gtk/images/scales.pngbin3543 -> 4148 bytes
-rw-r--r--docs/reference/gtk/images/scrolledwindow.pngbin3104 -> 3502 bytes
-rw-r--r--docs/reference/gtk/images/separator.pngbin3350 -> 3895 bytes
-rw-r--r--docs/reference/gtk/images/spinbutton.pngbin2867 -> 2507 bytes
-rw-r--r--docs/reference/gtk/images/statusbar.pngbin2794 -> 2758 bytes
-rw-r--r--docs/reference/gtk/images/toggle-button.pngbin1981 -> 2222 bytes
-rw-r--r--docs/reference/gtk/images/toolbar.pngbin4315 -> 4050 bytes
-rw-r--r--docs/reference/gtk/images/window.pngbin6114 -> 9194 bytes
-rw-r--r--docs/reference/gtk/tmpl/gtkaboutdialog.sgml66
-rw-r--r--docs/reference/gtk/tmpl/gtkdnd.sgml16
-rw-r--r--docs/reference/gtk/tmpl/gtkfilechooser.sgml14
-rw-r--r--docs/reference/gtk/tmpl/gtkfilechooserbutton.sgml73
-rw-r--r--docs/reference/gtk/tmpl/gtkliststore.sgml13
-rw-r--r--docs/reference/gtk/tmpl/gtkmain.sgml23
-rw-r--r--docs/reference/gtk/tmpl/gtkmenutoolbutton.sgml11
-rw-r--r--docs/reference/gtk/tmpl/gtkselection.sgml58
-rw-r--r--docs/reference/gtk/tmpl/gtktextbuffer.sgml12
-rw-r--r--docs/reference/gtk/tmpl/gtktoolitem.sgml8
-rw-r--r--docs/reference/gtk/visual_index.xml2
-rw-r--r--docs/tools/widgets.c33
47 files changed, 353 insertions, 34 deletions
diff --git a/ChangeLog b/ChangeLog
index 73774f6f0d..2fa6c7c907 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Oct 24 02:56:43 2004 Jonathan Blandford <jrb@redhat.com>
+
+ * docs/tools/widgets.c: Update GtkFileChooserButton doc shot.
+
2004-10-24 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkicontheme.c: Use the new g_key_file api in GLib.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 73774f6f0d..2fa6c7c907 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+Sun Oct 24 02:56:43 2004 Jonathan Blandford <jrb@redhat.com>
+
+ * docs/tools/widgets.c: Update GtkFileChooserButton doc shot.
+
2004-10-24 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkicontheme.c: Use the new g_key_file api in GLib.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 73774f6f0d..2fa6c7c907 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+Sun Oct 24 02:56:43 2004 Jonathan Blandford <jrb@redhat.com>
+
+ * docs/tools/widgets.c: Update GtkFileChooserButton doc shot.
+
2004-10-24 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkicontheme.c: Use the new g_key_file api in GLib.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 73774f6f0d..2fa6c7c907 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+Sun Oct 24 02:56:43 2004 Jonathan Blandford <jrb@redhat.com>
+
+ * docs/tools/widgets.c: Update GtkFileChooserButton doc shot.
+
2004-10-24 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkicontheme.c: Use the new g_key_file api in GLib.
diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 5f6ca49359..4e95e434cc 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,16 @@
+Sun Oct 24 02:54:36 2004 Jonathan Blandford <jrb@redhat.com>
+
+ * gtk/gtk.types: Add GtkAboutDialog and GtkFileChooserButton
+
+ * gtk/tmpl/GtkFileChooserButton.sgml: Write docs
+
+ * gtk/tmpl/GtkListStore.sgml: Update performance comment now that
+ we use GSequence.
+
+ * gtk/visual_index.xml: Fix up a couple of errors.
+
+ * gtk/images/*png: update
+
2004-10-22 Matthias Clasen <mclasen@redhat.com>
* gtk/gtk-sections.txt: Add new DND functions.
diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index 57ab11c30c..822c05cf21 100644
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -203,33 +203,34 @@ HTML_IMAGES = \
$(top_srcdir)/gtk/stock-icons/stock_media_record_24.png \
$(top_srcdir)/gtk/stock-icons/stock_media_rewind_24.png \
$(top_srcdir)/gtk/stock-icons/stock_media_stop_24.png \
- $(srcdir)/images/font-button.png \
+ $(srcdir)/images/accel-label.png \
$(srcdir)/images/button.png \
$(srcdir)/images/check-button.png \
$(srcdir)/images/color-button.png \
$(srcdir)/images/combo-box-entry.png \
$(srcdir)/images/entry.png \
+ $(srcdir)/images/file-button.png \
+ $(srcdir)/images/font-button.png \
$(srcdir)/images/frame.png \
+ $(srcdir)/images/icon-view.png \
+ $(srcdir)/images/image.png \
$(srcdir)/images/label.png \
$(srcdir)/images/list-and-tree.png \
- $(srcdir)/images/multiline-text.png \
- $(srcdir)/images/panes.png \
- $(srcdir)/images/radio-group.png \
- $(srcdir)/images/separator.png \
- $(srcdir)/images/toggle-button.png \
- $(srcdir)/images/window.png \
- $(srcdir)/images/accel-label.png \
- $(srcdir)/images/file-button.png \
- $(srcdir)/images/icon-view.png \
- $(srcdir)/images/toolbar.png \
$(srcdir)/images/menubar.png \
+ $(srcdir)/images/messagedialog.png \
+ $(srcdir)/images/multiline-text.png \
$(srcdir)/images/notebook.png \
+ $(srcdir)/images/panes.png \
$(srcdir)/images/progressbar.png \
+ $(srcdir)/images/radio-group.png \
+ $(srcdir)/images/scales.png \
$(srcdir)/images/scrolledwindow.png \
+ $(srcdir)/images/separator.png \
$(srcdir)/images/spinbutton.png \
$(srcdir)/images/statusbar.png \
- $(srcdir)/images/image.png \
- $(srcdir)/images/messagedialog.png
+ $(srcdir)/images/toggle-button.png \
+ $(srcdir)/images/toolbar.png \
+ $(srcdir)/images/window.png
# Extra options to supply to gtkdoc-fixref
FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
diff --git a/docs/reference/gtk/gtk.types b/docs/reference/gtk/gtk.types
index 0352e8eaf0..d983e18725 100644
--- a/docs/reference/gtk/gtk.types
+++ b/docs/reference/gtk/gtk.types
@@ -1,5 +1,6 @@
#include <gtk/gtk.h>
+gtk_about_dialog_get_type
gtk_accel_group_get_type
gtk_accel_map_get_type
gtk_accel_label_get_type
@@ -40,6 +41,7 @@ gtk_entry_get_type
gtk_event_box_get_type
gtk_expander_get_type
gtk_file_chooser_get_type
+gtk_file_chooser_button_get_type
gtk_file_chooser_dialog_get_type
gtk_file_chooser_widget_get_type
gtk_file_filter_get_type
diff --git a/docs/reference/gtk/images/accel-label.png b/docs/reference/gtk/images/accel-label.png
index 2e7d315d94..aa92877819 100644
--- a/docs/reference/gtk/images/accel-label.png
+++ b/docs/reference/gtk/images/accel-label.png
Binary files differ
diff --git a/docs/reference/gtk/images/button.png b/docs/reference/gtk/images/button.png
index 76e2f68f3a..b33190f6f6 100644
--- a/docs/reference/gtk/images/button.png
+++ b/docs/reference/gtk/images/button.png
Binary files differ
diff --git a/docs/reference/gtk/images/check-button.png b/docs/reference/gtk/images/check-button.png
index a42487fc2e..5c38179d37 100644
--- a/docs/reference/gtk/images/check-button.png
+++ b/docs/reference/gtk/images/check-button.png
Binary files differ
diff --git a/docs/reference/gtk/images/color-button.png b/docs/reference/gtk/images/color-button.png
index e48a5771a8..256c8d9a24 100644
--- a/docs/reference/gtk/images/color-button.png
+++ b/docs/reference/gtk/images/color-button.png
Binary files differ
diff --git a/docs/reference/gtk/images/combo-box-entry.png b/docs/reference/gtk/images/combo-box-entry.png
index edaacbf5da..d5f216fd35 100644
--- a/docs/reference/gtk/images/combo-box-entry.png
+++ b/docs/reference/gtk/images/combo-box-entry.png
Binary files differ
diff --git a/docs/reference/gtk/images/entry.png b/docs/reference/gtk/images/entry.png
index 708de64975..eebca164e4 100644
--- a/docs/reference/gtk/images/entry.png
+++ b/docs/reference/gtk/images/entry.png
Binary files differ
diff --git a/docs/reference/gtk/images/file-button.png b/docs/reference/gtk/images/file-button.png
index d0dc0d9698..4f40e8732b 100644
--- a/docs/reference/gtk/images/file-button.png
+++ b/docs/reference/gtk/images/file-button.png
Binary files differ
diff --git a/docs/reference/gtk/images/font-button.png b/docs/reference/gtk/images/font-button.png
index e8ae8ad93e..43e6aa5773 100644
--- a/docs/reference/gtk/images/font-button.png
+++ b/docs/reference/gtk/images/font-button.png
Binary files differ
diff --git a/docs/reference/gtk/images/frame.png b/docs/reference/gtk/images/frame.png
index e67db869ed..5a91f7e6dd 100644
--- a/docs/reference/gtk/images/frame.png
+++ b/docs/reference/gtk/images/frame.png
Binary files differ
diff --git a/docs/reference/gtk/images/icon-view.png b/docs/reference/gtk/images/icon-view.png
index 93eaff0863..49038c5df2 100644
--- a/docs/reference/gtk/images/icon-view.png
+++ b/docs/reference/gtk/images/icon-view.png
Binary files differ
diff --git a/docs/reference/gtk/images/image.png b/docs/reference/gtk/images/image.png
index 3200e6bace..f611aba507 100644
--- a/docs/reference/gtk/images/image.png
+++ b/docs/reference/gtk/images/image.png
Binary files differ
diff --git a/docs/reference/gtk/images/label.png b/docs/reference/gtk/images/label.png
index b3cc70bf57..c57ee62f6f 100644
--- a/docs/reference/gtk/images/label.png
+++ b/docs/reference/gtk/images/label.png
Binary files differ
diff --git a/docs/reference/gtk/images/list-and-tree.png b/docs/reference/gtk/images/list-and-tree.png
index cd4831df0c..fa720d8144 100644
--- a/docs/reference/gtk/images/list-and-tree.png
+++ b/docs/reference/gtk/images/list-and-tree.png
Binary files differ
diff --git a/docs/reference/gtk/images/menubar.png b/docs/reference/gtk/images/menubar.png
index 51f0f06a57..3e2fcd5a57 100644
--- a/docs/reference/gtk/images/menubar.png
+++ b/docs/reference/gtk/images/menubar.png
Binary files differ
diff --git a/docs/reference/gtk/images/messagedialog.png b/docs/reference/gtk/images/messagedialog.png
index 35c5f11731..61197ba4d0 100644
--- a/docs/reference/gtk/images/messagedialog.png
+++ b/docs/reference/gtk/images/messagedialog.png
Binary files differ
diff --git a/docs/reference/gtk/images/multiline-text.png b/docs/reference/gtk/images/multiline-text.png
index 8a0811abb2..d2f3d592f1 100644
--- a/docs/reference/gtk/images/multiline-text.png
+++ b/docs/reference/gtk/images/multiline-text.png
Binary files differ
diff --git a/docs/reference/gtk/images/notebook.png b/docs/reference/gtk/images/notebook.png
index 7c562e4db0..21bdb42f84 100644
--- a/docs/reference/gtk/images/notebook.png
+++ b/docs/reference/gtk/images/notebook.png
Binary files differ
diff --git a/docs/reference/gtk/images/panes.png b/docs/reference/gtk/images/panes.png
index 4214d9c615..5132d4790b 100644
--- a/docs/reference/gtk/images/panes.png
+++ b/docs/reference/gtk/images/panes.png
Binary files differ
diff --git a/docs/reference/gtk/images/progressbar.png b/docs/reference/gtk/images/progressbar.png
index abe116a187..21e4ed58e3 100644
--- a/docs/reference/gtk/images/progressbar.png
+++ b/docs/reference/gtk/images/progressbar.png
Binary files differ
diff --git a/docs/reference/gtk/images/radio-group.png b/docs/reference/gtk/images/radio-group.png
index 87200d0f5b..94552e0c04 100644
--- a/docs/reference/gtk/images/radio-group.png
+++ b/docs/reference/gtk/images/radio-group.png
Binary files differ
diff --git a/docs/reference/gtk/images/scales.png b/docs/reference/gtk/images/scales.png
index 3a54373499..342061863e 100644
--- a/docs/reference/gtk/images/scales.png
+++ b/docs/reference/gtk/images/scales.png
Binary files differ
diff --git a/docs/reference/gtk/images/scrolledwindow.png b/docs/reference/gtk/images/scrolledwindow.png
index b19f54b420..fa95d826ec 100644
--- a/docs/reference/gtk/images/scrolledwindow.png
+++ b/docs/reference/gtk/images/scrolledwindow.png
Binary files differ
diff --git a/docs/reference/gtk/images/separator.png b/docs/reference/gtk/images/separator.png
index d769bb5354..4e7f74ec6a 100644
--- a/docs/reference/gtk/images/separator.png
+++ b/docs/reference/gtk/images/separator.png
Binary files differ
diff --git a/docs/reference/gtk/images/spinbutton.png b/docs/reference/gtk/images/spinbutton.png
index 0f287d85e0..fb0bd45baf 100644
--- a/docs/reference/gtk/images/spinbutton.png
+++ b/docs/reference/gtk/images/spinbutton.png
Binary files differ
diff --git a/docs/reference/gtk/images/statusbar.png b/docs/reference/gtk/images/statusbar.png
index c4be9639ec..e257828d88 100644
--- a/docs/reference/gtk/images/statusbar.png
+++ b/docs/reference/gtk/images/statusbar.png
Binary files differ
diff --git a/docs/reference/gtk/images/toggle-button.png b/docs/reference/gtk/images/toggle-button.png
index a10fbd4e20..8ed666b700 100644
--- a/docs/reference/gtk/images/toggle-button.png
+++ b/docs/reference/gtk/images/toggle-button.png
Binary files differ
diff --git a/docs/reference/gtk/images/toolbar.png b/docs/reference/gtk/images/toolbar.png
index 55b11678d5..d5ae5806f2 100644
--- a/docs/reference/gtk/images/toolbar.png
+++ b/docs/reference/gtk/images/toolbar.png
Binary files differ
diff --git a/docs/reference/gtk/images/window.png b/docs/reference/gtk/images/window.png
index a28c8dc584..fee6dccfef 100644
--- a/docs/reference/gtk/images/window.png
+++ b/docs/reference/gtk/images/window.png
Binary files differ
diff --git a/docs/reference/gtk/tmpl/gtkaboutdialog.sgml b/docs/reference/gtk/tmpl/gtkaboutdialog.sgml
index f0952f750d..1f7dd84dc9 100644
--- a/docs/reference/gtk/tmpl/gtkaboutdialog.sgml
+++ b/docs/reference/gtk/tmpl/gtkaboutdialog.sgml
@@ -31,7 +31,71 @@ The <structname>GtkAboutDialog</structname> struct contains
only private fields and should not be directly accessed.
</para>
-@parent_instance:
+
+<!-- ##### ARG GtkAboutDialog:artists ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkAboutDialog:authors ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkAboutDialog:comments ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkAboutDialog:copyright ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkAboutDialog:documenters ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkAboutDialog:license ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkAboutDialog:logo ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkAboutDialog:name ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkAboutDialog:translator-credits ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkAboutDialog:version ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkAboutDialog:website ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkAboutDialog:website-label ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkAboutDialog:link-color ##### -->
+<para>
+
+</para>
<!-- ##### FUNCTION gtk_about_dialog_new ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtkdnd.sgml b/docs/reference/gtk/tmpl/gtkdnd.sgml
index c4793eb0f9..4d8ba07d9c 100644
--- a/docs/reference/gtk/tmpl/gtkdnd.sgml
+++ b/docs/reference/gtk/tmpl/gtkdnd.sgml
@@ -145,6 +145,22 @@ notification of drags.
@widget:
+<!-- ##### FUNCTION gtk_drag_dest_add_image_targets ##### -->
+<para>
+
+</para>
+
+@widget:
+
+
+<!-- ##### FUNCTION gtk_drag_dest_add_uri_targets ##### -->
+<para>
+
+</para>
+
+@widget:
+
+
<!-- ##### FUNCTION gtk_drag_finish ##### -->
<para>
Informs the drag source that the drop is finished, and
diff --git a/docs/reference/gtk/tmpl/gtkfilechooser.sgml b/docs/reference/gtk/tmpl/gtkfilechooser.sgml
index 296c55f0b5..1602106a30 100644
--- a/docs/reference/gtk/tmpl/gtkfilechooser.sgml
+++ b/docs/reference/gtk/tmpl/gtkfilechooser.sgml
@@ -7,12 +7,12 @@ File chooser interface used by GtkFileChooserWidget and GtkFileChooserDialog
<!-- ##### SECTION Long_Description ##### -->
<para>
#GtkFileChooser is an interface that can be implemented by file
- selection widgets. In GTK+, the main objects that implement
- this interface are #GtkFileChooserWidget and
- #GtkFileChooserDialog. You do not need to write an object that
- implements the #GtkFileChooser interface unless you are trying
- to adapt an existing file selector to expose a standard
- programming interface.
+ selection widgets. In GTK+, the main objects that implement this
+ interface are #GtkFileChooserWidget, #GtkFileChooserDialog, and
+ #GtkFileChooserButton. You do not need to write an object that
+ implements the #GtkFileChooser interface unless you are trying to
+ adapt an existing file selector to expose a standard programming
+ interface.
</para>
<refsect2 id="gtkfilechooser-encodings">
@@ -365,7 +365,7 @@ class "GtkFileChooserDefault" binding "my-own-gtkfilechooser-bindings"
<!-- ##### SECTION See_Also ##### -->
<para>
- #GtkFileChooserDialog, #GtkFileChooserWidget
+ #GtkFileChooserDialog, #GtkFileChooserWidget, #GtkFileChooserButton
</para>
<!-- ##### STRUCT GtkFileChooser ##### -->
diff --git a/docs/reference/gtk/tmpl/gtkfilechooserbutton.sgml b/docs/reference/gtk/tmpl/gtkfilechooserbutton.sgml
index 3ba80b506f..09c476c01c 100644
--- a/docs/reference/gtk/tmpl/gtkfilechooserbutton.sgml
+++ b/docs/reference/gtk/tmpl/gtkfilechooserbutton.sgml
@@ -6,19 +6,90 @@ A button to launch a file selection dialog
<!-- ##### SECTION Long_Description ##### -->
<para>
+The #GtkFileChooserButton is a widget that lets the user select a
+file. It implements the #GtkFileChooser interface. Visually, it is a
+file name with a button to bring up a #GtkFileChooserDialog.
+The user can then use that dialog to change the file associated with
+that button. This widget does not support setting the "select-multiple"
+property to %TRUE.
+</para>
+
+<example>
+<title>Create a button to let the user select a file in /etc</title>
+<programlisting>
+{
+ GtkWidget *button;
+
+ button = gtk_file_chooser_button_new (_("Select a file"));
+ gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (button),
+ "/etc");
+}
+</programlisting>
+</example>
+
+<para>
+The #GtkFileChooserButton supports all four #GtkFileChooserAction<!--
+-->s that the #GtkFileChooser supports. Two of the actions,
+%GTK_FILE_CHOOSER_ACTION_SAVE and
+%GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER, give the button the appearance
+of an entry next to a button. The user can type the name of a file in
+this entry, and it will complete as it types. The other two actions,
+%GTK_FILE_CHOOSER_ACTION_OPEN and
+%GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, make the #GtkFileChooserAction
+look like a #GtkButton.
+</para>
+<example>
+<title>Using GtkFileChooserButton in save mode</title>
+<programlisting>
+{
+ GtkWidget *button;
+
+ button = gtk_file_chooser_button_new (_("Save as..."));
+ gtk_file_chooser_set_action (GTK_FILE_CHOOSER (button),
+ GTK_FILE_CHOOSER_ACTION_SAVE);
+ gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER_BUTTON (button),
+ DEFAULT_SAVE_DIRECTORY);
+}
+</programlisting>
+</example>
+
+<important>
+<para>
+The #GtkFileChooserButton will ellipsize the label while in Open mode,
+and thus will thus request little horizontal space. To give the dialog
+more space, you should call gtk_widget_size_request(), or pack it in
+such a way that other interface elements give space to the widget.
</para>
+</important>
<!-- ##### SECTION See_Also ##### -->
<para>
-
+#GtkFileChooserDialog
</para>
<!-- ##### STRUCT GtkFileChooserButton ##### -->
<para>
+This should not be accessed directly. Use the accessor functions below.
+</para>
+
+
+<!-- ##### ARG GtkFileChooserButton:active ##### -->
+<para>
+%TRUE, if the #GtkFileChooserDialog associated with the button has been
+made visible. This can also be set by the application, though it is
+rarely useful to do so.
+</para>
+<!-- ##### ARG GtkFileChooserButton:dialog ##### -->
+<para>
+Instance of the #GtkFileChooserDialog associated with the button.
</para>
+<!-- ##### ARG GtkFileChooserButton:title ##### -->
+<para>
+Title to put on the #GtkFileChooserDialog associated with the button.
+</para>
<!-- ##### FUNCTION gtk_file_chooser_button_new ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtkliststore.sgml b/docs/reference/gtk/tmpl/gtkliststore.sgml
index fbe5b3596a..229f66911a 100644
--- a/docs/reference/gtk/tmpl/gtkliststore.sgml
+++ b/docs/reference/gtk/tmpl/gtkliststore.sgml
@@ -83,12 +83,13 @@ enum {
<refsect2>
<title>Performance Considerations</title>
<para>
-Internally, the #GtkListStore is implemented with a linked list with a
-tail pointer. As a result, it is fast at data insertion and deletion,
-and not as fast at random data access. The #GtkListStore sets the
-#GTK_TREE_MODEL_ITERS_PERSIST flag, which means that #GtkTreeIter<!--
--->s can be cached while the row exists. Thus, if access to a
-particular row is needed often, it is worth keeping the iter around.
+Internally, the #GtkListStore was implemented with a linked list with a
+tail pointer prior to GTK+ 2.6. As a result, it was fast at data
+insertion and deletion, and not fast at random data access. The
+#GtkListStore sets the #GTK_TREE_MODEL_ITERS_PERSIST flag, which means
+that #GtkTreeIter<!-- -->s can be cached while the row exists. Thus, if
+access to a particular row is needed often and your code is expected to
+run on older versions of GTK+, it is worth keeping the iter around.
</para>
</refsect2>
diff --git a/docs/reference/gtk/tmpl/gtkmain.sgml b/docs/reference/gtk/tmpl/gtkmain.sgml
index bdd307e177..fd1281787b 100644
--- a/docs/reference/gtk/tmpl/gtkmain.sgml
+++ b/docs/reference/gtk/tmpl/gtkmain.sgml
@@ -136,6 +136,29 @@ functions such as g_signal_connect().
@Returns:
+<!-- ##### FUNCTION gtk_init_with_args ##### -->
+<para>
+
+</para>
+
+@argc:
+@argv:
+@parameter_string:
+@entries:
+@translation_domain:
+@error:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_get_option_group ##### -->
+<para>
+
+</para>
+
+@open_default_display:
+@Returns:
+
+
<!-- ##### FUNCTION gtk_exit ##### -->
<para>
Terminates the program and returns the given exit code to the caller.
diff --git a/docs/reference/gtk/tmpl/gtkmenutoolbutton.sgml b/docs/reference/gtk/tmpl/gtkmenutoolbutton.sgml
index e153a3ee4f..80d523f8ce 100644
--- a/docs/reference/gtk/tmpl/gtkmenutoolbutton.sgml
+++ b/docs/reference/gtk/tmpl/gtkmenutoolbutton.sgml
@@ -90,3 +90,14 @@ A GtkToolItem containing a button with an additional dropdown menu
@Returns:
+<!-- ##### FUNCTION gtk_menu_tool_button_set_arrow_tooltip ##### -->
+<para>
+
+</para>
+
+@button:
+@tooltips:
+@tip_text:
+@tip_private:
+
+
diff --git a/docs/reference/gtk/tmpl/gtkselection.sgml b/docs/reference/gtk/tmpl/gtkselection.sgml
index 9982b574c9..59357ef1ea 100644
--- a/docs/reference/gtk/tmpl/gtkselection.sgml
+++ b/docs/reference/gtk/tmpl/gtkselection.sgml
@@ -134,6 +134,26 @@ Adds a table of #GtkTargetEntry into a target list.
</para>
@list:
+@info:
+
+
+<!-- ##### FUNCTION gtk_target_list_add_image_targets ##### -->
+<para>
+
+</para>
+
+@list:
+@info:
+@writable:
+
+
+<!-- ##### FUNCTION gtk_target_list_add_uri_targets ##### -->
+<para>
+
+</para>
+
+@list:
+@info:
<!-- ##### FUNCTION gtk_target_list_remove ##### -->
@@ -261,6 +281,44 @@ Zero-terminates the stored data.
@Returns:
+<!-- ##### FUNCTION gtk_selection_data_set_pixbuf ##### -->
+<para>
+
+</para>
+
+@selection_data:
+@pixbuf:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_selection_data_get_pixbuf ##### -->
+<para>
+
+</para>
+
+@selection_data:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_selection_data_set_uris ##### -->
+<para>
+
+</para>
+
+@selection_data:
+@uris:
+@Returns:
+
+
+<!-- ##### FUNCTION gtk_selection_data_get_uris ##### -->
+<para>
+
+</para>
+
+@selection_data:
+@Returns:
+
+
<!-- ##### FUNCTION gtk_selection_data_get_targets ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtktextbuffer.sgml b/docs/reference/gtk/tmpl/gtktextbuffer.sgml
index fcd641f8a9..a5a87d645c 100644
--- a/docs/reference/gtk/tmpl/gtktextbuffer.sgml
+++ b/docs/reference/gtk/tmpl/gtktextbuffer.sgml
@@ -295,6 +295,18 @@ types related to the text widget and how they work together.
@Returns:
+<!-- ##### FUNCTION gtk_text_buffer_backspace ##### -->
+<para>
+
+</para>
+
+@buffer:
+@iter:
+@interactive:
+@default_editable:
+@Returns:
+
+
<!-- ##### FUNCTION gtk_text_buffer_set_text ##### -->
<para>
diff --git a/docs/reference/gtk/tmpl/gtktoolitem.sgml b/docs/reference/gtk/tmpl/gtktoolitem.sgml
index 125806ae12..aa5bc95170 100644
--- a/docs/reference/gtk/tmpl/gtktoolitem.sgml
+++ b/docs/reference/gtk/tmpl/gtktoolitem.sgml
@@ -281,3 +281,11 @@ accessed through the functions described below.
@menu_item:
+<!-- ##### FUNCTION gtk_tool_item_rebuild_menu ##### -->
+<para>
+
+</para>
+
+@tool_item:
+
+
diff --git a/docs/reference/gtk/visual_index.xml b/docs/reference/gtk/visual_index.xml
index 7d9dd39782..951c7f2424 100644
--- a/docs/reference/gtk/visual_index.xml
+++ b/docs/reference/gtk/visual_index.xml
@@ -17,7 +17,7 @@
<link linkend="GtkEntry">
<inlinegraphic fileref="entry.png" format="PNG"></inlinegraphic>
</link>
- <link linkend="gtk-GtkFileChooserButton">
+ <link linkend="GtkFileChooserButton">
<inlinegraphic fileref="file-button.png" format="PNG"></inlinegraphic>
</link>
<link linkend="GtkFontButton">
diff --git a/docs/tools/widgets.c b/docs/tools/widgets.c
index cff1b15c97..12d7d188fe 100644
--- a/docs/tools/widgets.c
+++ b/docs/tools/widgets.c
@@ -327,21 +327,44 @@ static WidgetInfo *
create_file_button (void)
{
GtkWidget *vbox;
+ GtkWidget *vbox2;
GtkWidget *picker;
GtkWidget *align;
- vbox = gtk_vbox_new (FALSE, 3);
+ vbox = gtk_vbox_new (FALSE, 12);
+ vbox2 = gtk_vbox_new (FALSE, 3);
align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
- picker = gtk_file_chooser_button_new ("File Button");
+ picker = gtk_file_chooser_button_new ("File Chooser Button");
gtk_widget_set_size_request (picker, 150, -1);
gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (picker), "/etc/yum.conf");
gtk_container_add (GTK_CONTAINER (align), picker);
- gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox2), align, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox2),
+ gtk_label_new ("File Button (Open)"),
+ FALSE, FALSE, 0);
+
gtk_box_pack_start (GTK_BOX (vbox),
- gtk_label_new ("File Button"),
+ vbox2, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox),
+ gtk_hseparator_new (),
FALSE, FALSE, 0);
- return new_widget_info ("file-button", vbox, SMALL);
+ vbox2 = gtk_vbox_new (FALSE, 3);
+ align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
+ picker = gtk_file_chooser_button_new ("File Chooser Button");
+ gtk_file_chooser_set_action (GTK_FILE_CHOOSER (picker),
+ GTK_FILE_CHOOSER_ACTION_SAVE);
+ gtk_widget_set_size_request (picker, 150, -1);
+ gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (picker), "/etc/yum.conf");
+ gtk_container_add (GTK_CONTAINER (align), picker);
+ gtk_box_pack_start (GTK_BOX (vbox2), align, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox2),
+ gtk_label_new ("File Button (Save)"),
+ FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox),
+ vbox2, TRUE, TRUE, 0);
+
+ return new_widget_info ("file-button", vbox, MEDIUM);
}
static WidgetInfo *