callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bracket in #ifdef GTK_ENABLE_BROKEN.

Browse Source 
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.
This commit is contained in:
Havoc Pennington
2001-01-31 03:51:14 +00:00
committed by Havoc Pennington
parent 5cd2993201
commit f7d593c99d
43 changed files with 456 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/reference/gtk/Makefile.am
View File

@ -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)

2
docs/reference/gtk/gtk-docs.sgml
View File

@ -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;

74
docs/reference/gtk/tmpl/gtk-unused.sgml
View File

@ -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:
@active:
<!-- ##### FUNCTION gtk_color_selection_set_opacity ##### -->
<para>
Controls whether opacity can be set with the #GtkColorSelection.
@ -1839,6 +1882,14 @@ The first "flat" (no struct) enumerated type value.
@tree_model_sort:
<!-- ##### FUNCTION gtk_tree_view_column_get_col_type ##### -->
<para>
</para>
@tree_column:
@Returns:
<!-- ##### FUNCTION gtk_menu_factory_new ##### -->
<para>
@ -2234,6 +2285,12 @@ object.
@pixmap:
@mask:
<!-- ##### ARG GtkTextTag:justify-set ##### -->
<para>
</para>
<!-- ##### FUNCTION gtk_marshal_NONE__C_CALLBACK_C_CALLBACK ##### -->
<para>
@ -2395,6 +2452,15 @@ destroyed.
@window:
@defaultw:
<!-- ##### FUNCTION gtk_tree_store_setv ##### -->
<para>
</para>
@tree_store:
@iter:
@var_args:
<!-- ##### SIGNAL GtkTextBuffer::delete-text ##### -->
<para>
@ -2703,6 +2769,14 @@ Use to get the value of a GtkArg whose GtkType is GTK_TYPE_C_CALLBACK
@iter:
@Returns:
<!-- ##### FUNCTION gtk_tree_store_get_root_iter ##### -->
<para>
</para>
@tree_store:
@iter:
<!-- ##### STRUCT GtkTextBTree ##### -->
<para>

5
docs/reference/gtk/tmpl/gtkprogressbar.sgml
View File

@ -269,3 +269,8 @@ when it is shown in %GTK_PROGRESS_DISCRETE style.
</para>
<!-- ##### ARG GtkProgressBar:text ##### -->
<para>
</para>

9
docs/reference/gtk/tmpl/gtktext.sgml
View File

@ -2,10 +2,17 @@
GtkText
<!-- ##### SECTION Short_Description ##### -->
text widget which allows display and manipulation of arbitrary text
deprecated text widget, use #GtkTextView instead
<!-- ##### SECTION Long_Description ##### -->
<para>
<warning>
<para>
#GtkText is deprecated and unsupported. It is known to be
buggy. To use it, you must define the symbol %GTK_ENABLE_BROKEN
prior to including the GTK+ header files. Use #GtkTextView instead.
</para>
</warning>
A #GtkText widget allows one to display any given text and manipulate it
by deleting from one point to another, selecting a region, and various
other functions as outlined below. It is inherited from #GtkEditable.

17
docs/reference/gtk/tmpl/gtktexttag.sgml
View File

@ -41,7 +41,7 @@ types related to the text widget and how they work together.
@stretch_set:
@size_set:
@fg_stipple_set:
@justify_set:
@justification_set:
@left_margin_set:
@indent_set:
@rise_set:
@ -82,9 +82,9 @@ types related to the text widget and how they work together.
Describes a type of line wrapping.
</para>
@GTK_WRAPMODE_NONE: don't wrap lines; just use scrollbars
@GTK_WRAPMODE_CHAR: allow line breaks between any two characters
@GTK_WRAPMODE_WORD: allow line breaks only between words
@GTK_WRAP_NONE:
@GTK_WRAP_CHAR:
@GTK_WRAP_WORD:
<!-- ##### STRUCT GtkTextAttributes ##### -->
<para>
@ -93,7 +93,7 @@ Describes a type of line wrapping.
@refcount:
@appearance:
@justify:
@justification:
@direction:
@font:
@left_margin:
@ -322,10 +322,9 @@ Font as a #PangoFontDescription.
</para>
<!-- ##### ARG GtkTextTag:justify ##### -->
<!-- ##### ARG GtkTextTag:justification ##### -->
<para>
A #GtkJustification for the text. This is only used when the tag is
applied to the first character in a paragraph.
</para>
<!-- ##### ARG GtkTextTag:language ##### -->
@ -468,7 +467,7 @@ applies to the first character in a paragraph.
</para>
<!-- ##### ARG GtkTextTag:justify-set ##### -->
<!-- ##### ARG GtkTextTag:justification-set ##### -->
<para>
</para>

3
docs/reference/gtk/tmpl/gtktextview.sgml
View File

@ -85,8 +85,8 @@ types related to the text widget and how they work together.
@use_align:
@xalign:
@yalign:
@Returns:
<!-- # Unused Parameters # -->
@Returns:
@mark_within_margin:
@ -97,6 +97,7 @@ types related to the text widget and how they work together.
@text_view:
@mark:
<!-- # Unused Parameters # -->
@Returns:

9
docs/reference/gtk/tmpl/gtktree.sgml
View File

@ -2,10 +2,17 @@
GtkTree
<!-- ##### SECTION Short_Description ##### -->
A treelist widget.
Deprecated tree widget (use #GtkTreeView instead).
<!-- ##### SECTION Long_Description ##### -->
<para>
<warning>
<para>
#GtkTree is deprecated and unsupported. It is known to be
buggy. To use it, you must define the symbol %GTK_ENABLE_BROKEN
prior to including the GTK+ header files. Use #GtkTreeView intead.
</para>
</warning>
The #GtkTree widget is a container that shows users a list of items, in a tree format complete with branches and leafnodes. Branches can be expanded to show their child items, or collapsed to hide them.
</para>

29
docs/reference/gtk/tmpl/gtktreestore.sgml
View File

@ -84,16 +84,6 @@ GtkTreeStore
@Varargs:
<!-- ##### FUNCTION gtk_tree_store_setv ##### -->
<para>
</para>
@tree_store:
@iter:
@var_args:
<!-- ##### FUNCTION gtk_tree_store_get ##### -->
<para>
@ -104,16 +94,6 @@ GtkTreeStore
@Varargs:
<!-- ##### FUNCTION gtk_tree_store_getv ##### -->
<para>
</para>
@tree_store:
@iter:
@var_args:
<!-- ##### FUNCTION gtk_tree_store_remove ##### -->
<para>
@ -176,15 +156,6 @@ GtkTreeStore
@parent:
<!-- ##### FUNCTION gtk_tree_store_get_root_iter ##### -->
<para>
</para>
@tree_store:
@iter:
<!-- ##### FUNCTION gtk_tree_store_is_ancestor ##### -->
<para>

16
docs/reference/gtk/tmpl/gtktreeview.sgml
View File

@ -157,6 +157,8 @@ GtkTreeView
</para>
@tree_view:
@setting:
<!-- # Unused Parameters # -->
@active:
@ -201,18 +203,6 @@ GtkTreeView
@Returns:
<!-- ##### FUNCTION gtk_tree_view_move_to ##### -->
<para>
</para>
@tree_view:
@path:
@column:
@row_align:
@col_align:
<!-- ##### FUNCTION gtk_tree_view_get_path_at_pos ##### -->
<para>
@ -224,6 +214,8 @@ GtkTreeView
@y:
@path:
@column:
@cell_x:
@cell_y:
@Returns:

28
docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml
View File

@ -29,6 +29,7 @@ GtkTreeViewColumn
@parent:
@tree_view:
@button:
@child:
@window:
@justification:
@id:
@ -150,24 +151,6 @@ GtkTreeViewColumn
@type:
<!-- ##### FUNCTION gtk_tree_view_column_get_col_type ##### -->
<para>
</para>
@tree_column:
@Returns:
<!-- ##### FUNCTION gtk_tree_view_column_get_size ##### -->
<para>
</para>
@tree_column:
@Returns:
<!-- ##### FUNCTION gtk_tree_view_column_set_width ##### -->
<para>
@ -231,15 +214,6 @@ GtkTreeViewColumn
@Returns:
<!-- ##### FUNCTION gtk_tree_view_column_set_header_clickable ##### -->
<para>
</para>
@tree_column:
@active:
<!-- ##### FUNCTION gtk_tree_view_column_set_widget ##### -->
<para>

9
docs/reference/gtk/tmpl/gtkwindow.sgml
View File

@ -245,6 +245,15 @@ it's larger
@Returns:
<!-- ##### SIGNAL GtkWindow::frame-event ##### -->
<para>
</para>
@window: the object which received the signal.
@event:
@Returns:
<!-- ##### SIGNAL GtkWindow::set-focus ##### -->
<para>