Commit f7d593c9 authored by Havoc Pennington's avatar Havoc Pennington Committed by Havoc Pennington

bracket in #ifdef GTK_ENABLE_BROKEN.

2001-01-30  Havoc Pennington  <hp@pobox.com>

	* gtk/gtktreeitem.h, gtk/gtktree.h, gtk/gtktext.h: bracket in
	#ifdef GTK_ENABLE_BROKEN.

	* gtk/gtktreeitem.c, gtk/gtktree.c, gtk/gtktext.c: #define
	GTK_ENABLE_BROKEN just before including the broken headers.

	* gtk/gtktypeutils.c: #define GTK_ENABLE_BROKEN, so we can get the
	deprecated types registered.

	* gtk/testgtk.c, gtk/testselection.c: #define GTK_ENABLE_BROKEN,
	we have to test the broken stuff.

        * docs/Changes-2.0.txt: explain GTK_ENABLE_BROKEN

2001-01-30  Havoc Pennington  <hp@pobox.com>

        Also committed a bunch of automatic changes made by gtk-doc,
	after reviewing for correctness.

	* gtk/tmpl/gtktext.sgml: add warning about deprecation and note
	about what to use instead

	* gtk/tmpl/gtktree.sgml: ditto

	* gtk/Makefile.am (scan): pass --deprecated-guards option to
	gtk-doc; requires new version of gtk-doc from CVS

	* gtk/gtk-docs.sgml: move GtkText to the deprecated section
	instead of the GtkTextView section. Oops.
parent 5cd29932
2001-01-30 Havoc Pennington <hp@pobox.com>
* gtk/gtktreeitem.h, gtk/gtktree.h, gtk/gtktext.h: bracket in
#ifdef GTK_ENABLE_BROKEN.
* gtk/gtktreeitem.c, gtk/gtktree.c, gtk/gtktext.c: #define
GTK_ENABLE_BROKEN just before including the broken headers.
* gtk/gtktypeutils.c: #define GTK_ENABLE_BROKEN, so we can get the
deprecated types registered.
* gtk/testgtk.c, gtk/testselection.c: #define GTK_ENABLE_BROKEN,
we have to test the broken stuff.
* docs/Changes-2.0.txt: explain GTK_ENABLE_BROKEN
2001-01-30 Havoc Pennington <hp@redhat.com>
* gtk/gtkliststore.c (gtk_list_store_insert_before): fix bug in
......
2001-01-30 Havoc Pennington <hp@pobox.com>
* gtk/gtktreeitem.h, gtk/gtktree.h, gtk/gtktext.h: bracket in
#ifdef GTK_ENABLE_BROKEN.
* gtk/gtktreeitem.c, gtk/gtktree.c, gtk/gtktext.c: #define
GTK_ENABLE_BROKEN just before including the broken headers.
* gtk/gtktypeutils.c: #define GTK_ENABLE_BROKEN, so we can get the
deprecated types registered.
* gtk/testgtk.c, gtk/testselection.c: #define GTK_ENABLE_BROKEN,
we have to test the broken stuff.
* docs/Changes-2.0.txt: explain GTK_ENABLE_BROKEN
2001-01-30 Havoc Pennington <hp@redhat.com>
* gtk/gtkliststore.c (gtk_list_store_insert_before): fix bug in
......
2001-01-30 Havoc Pennington <hp@pobox.com>
* gtk/gtktreeitem.h, gtk/gtktree.h, gtk/gtktext.h: bracket in
#ifdef GTK_ENABLE_BROKEN.
* gtk/gtktreeitem.c, gtk/gtktree.c, gtk/gtktext.c: #define
GTK_ENABLE_BROKEN just before including the broken headers.
* gtk/gtktypeutils.c: #define GTK_ENABLE_BROKEN, so we can get the
deprecated types registered.
* gtk/testgtk.c, gtk/testselection.c: #define GTK_ENABLE_BROKEN,
we have to test the broken stuff.
* docs/Changes-2.0.txt: explain GTK_ENABLE_BROKEN
2001-01-30 Havoc Pennington <hp@redhat.com>
* gtk/gtkliststore.c (gtk_list_store_insert_before): fix bug in
......
2001-01-30 Havoc Pennington <hp@pobox.com>
* gtk/gtktreeitem.h, gtk/gtktree.h, gtk/gtktext.h: bracket in
#ifdef GTK_ENABLE_BROKEN.
* gtk/gtktreeitem.c, gtk/gtktree.c, gtk/gtktext.c: #define
GTK_ENABLE_BROKEN just before including the broken headers.
* gtk/gtktypeutils.c: #define GTK_ENABLE_BROKEN, so we can get the
deprecated types registered.
* gtk/testgtk.c, gtk/testselection.c: #define GTK_ENABLE_BROKEN,
we have to test the broken stuff.
* docs/Changes-2.0.txt: explain GTK_ENABLE_BROKEN
2001-01-30 Havoc Pennington <hp@redhat.com>
* gtk/gtkliststore.c (gtk_list_store_insert_before): fix bug in
......
2001-01-30 Havoc Pennington <hp@pobox.com>
* gtk/gtktreeitem.h, gtk/gtktree.h, gtk/gtktext.h: bracket in
#ifdef GTK_ENABLE_BROKEN.
* gtk/gtktreeitem.c, gtk/gtktree.c, gtk/gtktext.c: #define
GTK_ENABLE_BROKEN just before including the broken headers.
* gtk/gtktypeutils.c: #define GTK_ENABLE_BROKEN, so we can get the
deprecated types registered.
* gtk/testgtk.c, gtk/testselection.c: #define GTK_ENABLE_BROKEN,
we have to test the broken stuff.
* docs/Changes-2.0.txt: explain GTK_ENABLE_BROKEN
2001-01-30 Havoc Pennington <hp@redhat.com>
* gtk/gtkliststore.c (gtk_list_store_insert_before): fix bug in
......
2001-01-30 Havoc Pennington <hp@pobox.com>
* gtk/gtktreeitem.h, gtk/gtktree.h, gtk/gtktext.h: bracket in
#ifdef GTK_ENABLE_BROKEN.
* gtk/gtktreeitem.c, gtk/gtktree.c, gtk/gtktext.c: #define
GTK_ENABLE_BROKEN just before including the broken headers.
* gtk/gtktypeutils.c: #define GTK_ENABLE_BROKEN, so we can get the
deprecated types registered.
* gtk/testgtk.c, gtk/testselection.c: #define GTK_ENABLE_BROKEN,
we have to test the broken stuff.
* docs/Changes-2.0.txt: explain GTK_ENABLE_BROKEN
2001-01-30 Havoc Pennington <hp@redhat.com>
* gtk/gtkliststore.c (gtk_list_store_insert_before): fix bug in
......
2001-01-30 Havoc Pennington <hp@pobox.com>
* gtk/gtktreeitem.h, gtk/gtktree.h, gtk/gtktext.h: bracket in
#ifdef GTK_ENABLE_BROKEN.
* gtk/gtktreeitem.c, gtk/gtktree.c, gtk/gtktext.c: #define
GTK_ENABLE_BROKEN just before including the broken headers.
* gtk/gtktypeutils.c: #define GTK_ENABLE_BROKEN, so we can get the
deprecated types registered.
* gtk/testgtk.c, gtk/testselection.c: #define GTK_ENABLE_BROKEN,
we have to test the broken stuff.
* docs/Changes-2.0.txt: explain GTK_ENABLE_BROKEN
2001-01-30 Havoc Pennington <hp@redhat.com>
* gtk/gtkliststore.c (gtk_list_store_insert_before): fix bug in
......
......@@ -287,3 +287,9 @@ Incompatible Changes from GTK+-1.2 to GTK+-2.0:
implementations. The draw method was rarely called in practice
anyway.
- GtkText and GtkTree are buggy and broken. We don't recommend using
them, and changing old code to avoid them is a good idea. The
recommended alternatives are GtkTextView and GtkTreeView. The
broken widgets are not declared in the headers by default; to use
them, define the symbol GTK_ENABLE_BROKEN during compilation. In
some future release, these widgets will be removed from GTK+.
2001-01-30 Havoc Pennington <hp@pobox.com>
Also committed a bunch of automatic changes made by gtk-doc,
after reviewing for correctness.
* gtk/tmpl/gtktext.sgml: add warning about deprecation and note
about what to use instead
* gtk/tmpl/gtktree.sgml: ditto
* gtk/Makefile.am (scan): pass --deprecated-guards option to
gtk-doc
* gtk/gtk-docs.sgml: move GtkText to the deprecated section
instead of the GtkTextView section. Oops.
Tue Jan 30 16:01:54 2001 Owen Taylor <otaylor@redhat.com>
* gtk/tmpl/gtkclist.sgml: Added note explaining how
......
......@@ -98,27 +98,6 @@ animation
@Returns:
<!-- ##### FUNCTION gdk_pixbuf_frame_copy ##### -->
<para>
</para>
@src:
@Returns:
<!-- # Unused Parameters # -->
@frame:
<!-- ##### FUNCTION gdk_pixbuf_frame_free ##### -->
<para>
</para>
@frame:
<!-- # Unused Parameters # -->
@src:
<!-- ##### FUNCTION gdk_pixbuf_frame_get_pixbuf ##### -->
<para>
......
......@@ -19,6 +19,15 @@ Drawables to Pixbufs
@pixbuf: The pixbuf that is losing its last reference.
@data: User closure data.
<!-- ##### FUNCTION gdk_pixbuf_frame_copy ##### -->
<para>
</para>
@src:
@Returns:
@frame:
<!-- ##### SECTION ./tmpl/rendering.sgml:See_Also ##### -->
<para>
GdkRGB
......@@ -705,6 +714,14 @@ Getting parts of a drawable's image data into a pixbuf.
Xlib Rendering
<!-- ##### FUNCTION gdk_pixbuf_frame_free ##### -->
<para>
</para>
@frame:
@src:
<!-- ##### SECTION ./tmpl/gdk-pixbuf-io.sgml:Title ##### -->
gdk-pixbuf-io
......
......@@ -121,16 +121,6 @@ Colormaps and Colors
@ncolors:
<!-- ##### FUNCTION gdk_colormap_query_color ##### -->
<para>
</para>
@colormap:
@pixel:
@result:
<!-- ##### FUNCTION gdk_colormap_get_visual ##### -->
<para>
......
......@@ -111,24 +111,6 @@ Drawing Primitives
@height:
<!-- ##### FUNCTION gdk_drawable_get_clip_region ##### -->
<para>
</para>
@drawable:
@Returns:
<!-- ##### FUNCTION gdk_drawable_get_visible_region ##### -->
<para>
</para>
@drawable:
@Returns:
<!-- ##### FUNCTION gdk_draw_point ##### -->
<para>
......
......@@ -95,8 +95,6 @@ example, it is these characters which should be added to the input buffer.
When using <link linkend="gdk-Input-Methods"> Input Methods</link> to support
internationalized text input, the composed characters appear here after the
pre-editing has been completed.
@hardware_keycode:
@group:
<!-- ##### STRUCT GdkEventButton ##### -->
<para>
......
......@@ -226,16 +226,6 @@ Gets the timestamp from a #GdkEvent.
no timestamp.
<!-- ##### FUNCTION gdk_event_get_state ##### -->
<para>
</para>
@event:
@state:
@Returns:
<!-- ##### FUNCTION gdk_event_get_axis ##### -->
<para>
......
......@@ -36,6 +36,32 @@ Retrieves the motion history for a given device/window pair.
</para>
<!-- ##### FUNCTION gdk_keymap_translate_keyboard_state ##### -->
<para>
</para>
@keymap:
@hardware_keycode:
@state:
@group:
@keyval:
@effective_group:
@level:
@unused_modifiers:
@Returns:
<!-- ##### FUNCTION gdk_keymap_get_entries_for_keyval ##### -->
<para>
</para>
@keymap:
@keyval:
@keys:
@n_keys:
@Returns:
<!-- ##### SECTION ./tmpl/gdkregion.sgml:Long_Description ##### -->
<para>
......@@ -90,10 +116,65 @@ This is all pixels in either of @source1 or @source2.
@source2: a #GdkRegion.
@Returns: the union of @source1 and @source2.
<!-- ##### FUNCTION gdk_drawable_get_visible_region ##### -->
<para>
</para>
@drawable:
@Returns:
<!-- ##### FUNCTION gdk_colormap_query_color ##### -->
<para>
</para>
@colormap:
@pixel:
@result:
<!-- ##### FUNCTION gdk_event_get_state ##### -->
<para>
</para>
@event:
@state:
@Returns:
<!-- ##### SECTION ./tmpl/gdkregion.sgml:Short_Description ##### -->
<!-- ##### FUNCTION gdk_window_get_decorations ##### -->
<para>
</para>
@window:
@decorations:
@Returns:
<!-- ##### FUNCTION gdk_keymap_get_entries_for_keycode ##### -->
<para>
</para>
@keymap:
@hardware_keycode:
@keys:
@keyvals:
@n_entries:
@Returns:
<!-- ##### FUNCTION gdk_drawable_get_clip_region ##### -->
<para>
</para>
@drawable:
@Returns:
<!-- ##### FUNCTION gdk_input_set_key ##### -->
<para>
Sets the key event generated when a macro button is pressed.
......@@ -116,6 +197,13 @@ configuration information.
is internal data of GTK+ and should not be modified
or freed.
<!-- ##### STRUCT GdkKeymap ##### -->
<para>
</para>
@parent_instance:
<!-- ##### SECTION ./tmpl/input_methods.sgml.sgml:See_Also ##### -->
<para>
......@@ -179,6 +267,24 @@ onto the predefined valuator types that GTK+ understands.
@axes: an array of GdkAxisUse. This length of this array
must match the number of axes for the device.
<!-- ##### STRUCT GdkSpan ##### -->
<para>
</para>
@x:
@y:
@width:
<!-- ##### STRUCT GdkKeyInfo ##### -->
<para>
</para>
@keycode:
@group:
@level:
<!-- ##### FUNCTION gdk_input_set_source ##### -->
<para>
Sets the source type for a device.
......@@ -187,6 +293,27 @@ Sets the source type for a device.
@deviceid: the device to configure
@source: the new source type.
<!-- ##### FUNCTION gdk_region_spans_intersect_foreach ##### -->
<para>
Intersects a set of spans with a region and call a user specified
function for each resulting spanline. This function is a lot more effective
if the spans are sorted.
</para>
@region: The region to intersect against.
@spans: Array of spans to intersect.
@n_spans: Number of spans.
@sorted: True if the spans are sorted in increasing y order.
@function: The function to call for each intersected spanline.
@data: Opaque user data passed to function.
<!-- ##### FUNCTION gdk_keymap_get_default ##### -->
<para>
</para>
@Returns:
<!-- ##### SECTION ./tmpl/gdkregion.sgml:Title ##### -->
Points, Rectangles and Regions
......@@ -200,10 +327,42 @@ Returns the intersection of two regions.
@source2: a #GdkRegion.
@Returns: the intersection of @source1 and @source2.
<!-- ##### FUNCTION gdk_keymap_lookup_key ##### -->
<para>
</para>
@keymap:
@key:
@Returns:
<!-- ##### USER_FUNCTION GdkSpanFunc ##### -->
<para>
</para>
@span: The intersected part of the span.
@data: Opaque data passed by user.
<!-- ##### STRUCT GdkKeymapClass ##### -->
<para>
</para>
<!-- ##### SECTION ./tmpl/gdkkeys.sgml:Title ##### -->
Keyboard Handling
<!-- ##### STRUCT GdkKeymapKey ##### -->
<para>
</para>
@keycode:
@group:
@level:
<!-- ##### FUNCTION gdk_input_set_mode ##### -->
<para>
Enables or disables a device, and determines how the
......
......@@ -29,96 +29,6 @@ using gdk_keyval_to_upper() and gdk_keyval_to_lower().
</para>
<!-- ##### STRUCT GdkKeymap ##### -->
<para>
</para>
@parent_instance:
<!-- ##### STRUCT GdkKeymapClass ##### -->
<para>
</para>
<!-- ##### STRUCT GdkKeymapKey ##### -->
<para>
</para>
@keycode:
@group:
@level:
<!-- ##### STRUCT GdkKeyInfo ##### -->
<para>
</para>
@keycode:
@group:
@level:
<!-- ##### FUNCTION gdk_keymap_get_default ##### -->
<para>
</para>
@Returns:
<!-- ##### FUNCTION gdk_keymap_lookup_key ##### -->
<para>
</para>
@keymap:
@key:
@Returns:
<!-- ##### FUNCTION gdk_keymap_translate_keyboard_state ##### -->
<para>
</para>
@keymap:
@hardware_keycode:
@state:
@group:
@keyval:
@effective_group:
@level:
@unused_modifiers:
@Returns:
<!-- ##### FUNCTION gdk_keymap_get_entries_for_keyval ##### -->
<para>
</para>
@keymap:
@keyval:
@keys:
@n_keys:
@Returns:
<!-- ##### FUNCTION gdk_keymap_get_entries_for_keycode ##### -->
<para>
</para>
@keymap:
@hardware_keycode:
@keys:
@keyvals:
@n_entries:
@Returns:
<!-- ##### FUNCTION gdk_keyval_name ##### -->
<para>
Converts a key value into a symbolic name.
......
......@@ -266,36 +266,3 @@ Returns the union of a region and a rectangle.
@source2:
<!-- ##### STRUCT GdkSpan ##### -->
<para>
</para>
@x:
@y:
@width:
<!-- ##### USER_FUNCTION GdkSpanFunc ##### -->
<para>
</para>
@span: The intersected part of the span.
@data: Opaque data passed by user.
<!-- ##### FUNCTION gdk_region_spans_intersect_foreach ##### -->
<para>
Intersects a set of spans with a region and call a user specified
function for each resulting spanline. This function is a lot more effective
if the spans are sorted.
</para>
@region: The region to intersect against.
@spans: Array of spans to intersect.
@n_spans: Number of spans.
@sorted: True if the spans are sorted in increasing y order.
@function: The function to call for each intersected spanline.
@data: Opaque user data passed to function.
......@@ -871,16 +871,6 @@ Windows
@decorations:
<!-- ##### FUNCTION gdk_window_get_decorations ##### -->
<para>
</para>
@window:
@decorations:
@Returns:
<!-- ##### ENUM GdkWMDecoration ##### -->
<para>
......
......@@ -103,7 +103,7 @@ endif
scan:
(cd $(srcdir) \
&& CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj --module=$(DOC_MODULE) \
&& gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(EXTRA_HFILES))
&& gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --deprecated-guards="GTK_ENABLE_BROKEN|GTK_DISABLE_DEPRECATED" --ignore-headers="$(IGNORE_HFILES)" $(EXTRA_HFILES))
templates:
cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
......
......@@ -261,7 +261,6 @@ An advanced widget set.
&gtk-TextWidget;
&gtk-GtkTextIter;
&gtk-GtkTextMark;
&GtkText;
&GtkTextBuffer;
&GtkTextTag;
&GtkTextTagTable;
......@@ -393,6 +392,7 @@ An advanced widget set.
&GtkPreview;
&GtkProgress;
&GtkRuler;
&GtkText;
&GtkTipsQuery;
&GtkTree;
&GtkTreeItem;
......
......@@ -327,6 +327,13 @@ A structure used to return values from @gtk_type_query.
@func_data:
@args:
<!-- ##### ARG GtkTextTag:justify ##### -->
<para>
A #GtkJustification for the text. This is only used when the tag is
applied to the first character in a paragraph.
</para>
<!-- ##### USER_FUNCTION GtkSignalMarshal ##### -->
<para>
This is currently a hack left in for a scheme wrapper library.
......@@ -744,6 +751,15 @@ Deprecated.
@func_data:
@args:
<!-- ##### FUNCTION gtk_tree_store_getv ##### -->
<para>
</para>
@tree_store:
@iter:
@var_args:
<!-- ##### FUNCTION gtk_text_buffer_cut ##### -->
<para>
......@@ -854,6 +870,17 @@ the number of columns specified.
@entries:
@nentries:
<!-- ##### FUNCTION gtk_tree_view_move_to ##### -->
<para>
</para>
@tree_view:
@path:
@column:
@row_align:
@col_align:
<!-- ##### FUNCTION gtk_text_buffer_find_string ##### -->
<para>
......@@ -1326,6 +1353,14 @@ of the widget.
@editable: the object which received the signal.
<!-- ##### FUNCTION gtk_tree_view_column_get_size ##### -->
<para>
</para>
@tree_column:
@Returns:
<!-- ##### STRUCT GtkMenuFactory ##### -->
<para>
......@@ -1689,6 +1724,14 @@ should have in their prototype (of length nparams).
@func_data:
@args:
<!-- ##### FUNCTION gtk_tree_view_column_set_header_clickable ##### -->
<para>
</para>
@tree_column: