Commit 2c5d938f authored by Havoc Pennington's avatar Havoc Pennington Committed by Havoc Pennington

CVS is doing its broken pipe thing, this is more of the previous commit

2001-02-02  Havoc Pennington  <hp@redhat.com>
parent cc00e1c5
......@@ -6,6 +6,7 @@ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
-I$(top_builddir)/gdk \
-DGTK_DISABLE_COMPAT_H \
-DGTK_DISABLE_DEPRECATED \
@GTK_DEBUG_FLAGS@ \
@GTK_XIM_FLAGS@ \
@GTK_LOCALE_FLAGS@ \
......
......@@ -15,6 +15,7 @@ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
-I$(top_builddir)/gdk \
-DGTK_DISABLE_COMPAT_H \
-DGTK_DISABLE_DEPRECATED \
@GTK_DEBUG_FLAGS@ \
@GTK_XIM_FLAGS@ \
@GTK_LOCALE_FLAGS@ \
......
......@@ -98,9 +98,9 @@ int main(int argc, char **argv)
gtk_container_add(GTK_CONTAINER(window), vbox);
drawing_area = gtk_drawing_area_new();
gtk_drawing_area_size(GTK_DRAWING_AREA(drawing_area),
gdk_pixbuf_get_width (pixbuf),
gdk_pixbuf_get_height (pixbuf));
gtk_widget_set_usize(GTK_WIDGET(drawing_area),
gdk_pixbuf_get_width (pixbuf),
gdk_pixbuf_get_height (pixbuf));
gtk_signal_connect(GTK_OBJECT(drawing_area), "expose_event",
GTK_SIGNAL_FUNC(expose_cb), NULL);
......
......@@ -393,7 +393,7 @@ new_testrgb_window (GdkPixbuf *pixbuf, gchar *title)
drawing_area = gtk_drawing_area_new ();
temp_box = gtk_hbox_new (FALSE, 0);
gtk_drawing_area_size (GTK_DRAWING_AREA(drawing_area), w, h);
gtk_widget_set_usize (GTK_WIDGET(drawing_area), w, h);
gtk_box_pack_start (GTK_BOX (temp_box), drawing_area, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), temp_box, FALSE, FALSE, 0);
......
2001-02-01 Havoc Pennington <hp@redhat.com>
* gtk/gtk-sections.txt: updated
* gtk/gtk-docs.sgml: Move the below from "Deprecated" section to
"special-purpose" section; move GtkItem out of deprecated section,
since GtkMenuItem uses it, though probably the GtkItem signals
should just migrate down to GtkMenuItem someday it won't happen
for 2.0
* gtk/tmpl/gtkgamma.sgml: add note about eventual removal
* gtk/tmpl/gtkcurve.sgml: add note about eventual removal
* gtk/tmpl/gtkruler.sgml: add note about eventual removal
* gtk/tmpl/gtkhruler.sgml: add note about eventual removal
* gtk/tmpl/gtkvruler.sgml: add note about eventual removal
* gtk/tmpl/gtkinputdialog.sgml: add note about eventual removal
2001-01-30 Havoc Pennington <hp@pobox.com>
Also committed a bunch of automatic changes made by gtk-doc,
......
......@@ -357,10 +357,11 @@ An advanced widget set.
<title>Abstract Base Classes</title>
&GtkBin;
&GtkBox;
&GtkButtonBox;
&GtkContainer;
&gtk-GtkEditable;
&GtkOldEditable;
&GtkButtonBox;
&GtkItem;
&GtkMisc;
&GtkObject;
&GtkPaned;
......@@ -376,27 +377,30 @@ An advanced widget set.
&GtkSocket;
</sect1>
<sect1 id="SpecialObjects">
<title>Special-purpose features</title>
&GtkCurve;
&GtkGammaCurve;
&GtkHRuler;
&GtkRuler;
&GtkVRuler;
</sect1>
<sect1 id="DeprecatedObjects">
<title>Deprecated</title>
&GtkCList;
&GtkCTree;
&GtkCurve;
&GtkData;
&GtkGammaCurve;
&GtkHRuler;
&GtkItem;
&GtkList;
&GtkListItem;
&GtkPacker;
&GtkPixmap;
&GtkPreview;
&GtkProgress;
&GtkRuler;
&GtkPreview;
&GtkText;
&GtkTipsQuery;
&GtkTree;
&GtkTreeItem;
&GtkVRuler;
</sect1>
</chapter>
......
......@@ -1143,7 +1143,6 @@ GTK_ITEM_FACTORY_GET_CLASS
<FILE>gtklabel</FILE>
<TITLE>GtkLabel</TITLE>
GtkLabel
GtkLabelWord
gtk_label_new
gtk_label_set_text
gtk_label_set_attributes
......@@ -1893,7 +1892,6 @@ GTK_SPIN_BUTTON_GET_CLASS
<FILE>gtkstatusbar</FILE>
<TITLE>GtkStatusbar</TITLE>
GtkStatusbar
GtkStatusbarMsg
gtk_statusbar_new
gtk_statusbar_get_context_id
gtk_statusbar_push
......@@ -2525,16 +2523,13 @@ gtk_tree_store_set_n_columns
gtk_tree_store_set_column_type
gtk_tree_store_set_cell
gtk_tree_store_set
gtk_tree_store_setv
gtk_tree_store_get
gtk_tree_store_getv
gtk_tree_store_remove
gtk_tree_store_insert
gtk_tree_store_insert_before
gtk_tree_store_insert_after
gtk_tree_store_prepend
gtk_tree_store_append
gtk_tree_store_get_root_iter
gtk_tree_store_is_ancestor
gtk_tree_store_iter_depth
<SUBSECTION Standard>
......@@ -2562,8 +2557,8 @@ gtk_tree_view_column_set_cell_data
gtk_tree_view_column_set_visible
gtk_tree_view_column_get_visible
gtk_tree_view_column_set_sizing
gtk_tree_view_column_get_col_type
gtk_tree_view_column_get_size
gtk_tree_view_column_get_sizing
gtk_tree_view_column_get_width
gtk_tree_view_column_set_width
gtk_tree_view_column_set_min_width
gtk_tree_view_column_get_min_width
......@@ -2571,7 +2566,7 @@ gtk_tree_view_column_set_max_width
gtk_tree_view_column_get_max_width
gtk_tree_view_column_set_title
gtk_tree_view_column_get_title
gtk_tree_view_column_set_header_clickable
gtk_tree_view_column_set_clickable
gtk_tree_view_column_set_widget
gtk_tree_view_column_get_widget
gtk_tree_view_column_set_justification
......@@ -2608,7 +2603,7 @@ gtk_tree_view_append_column
gtk_tree_view_remove_column
gtk_tree_view_insert_column
gtk_tree_view_get_column
gtk_tree_view_move_to
gtk_tree_view_scroll_to_cell
gtk_tree_view_get_path_at_pos
gtk_tree_view_expand_all
gtk_tree_view_collapse_all
......@@ -2637,7 +2632,7 @@ gtk_tree_model_simple_deleted
<SUBSECTION Standard>
GTK_TREE_MODEL_SIMPLE
GTK_IS_TREE_MODEL_SIMPLE
GTK_TYPE_MODEL_SIMPLE
GTK_TYPE_TREE_MODEL_SIMPLE
gtk_tree_model_simple_get_type
GTK_TREE_MODEL_SIMPLE_CLASS
GTK_IS_TREE_MODEL_SIMPLE_CLASS
......@@ -3002,7 +2997,7 @@ gtk_widget_modify_font
gtk_widget_create_pango_context
gtk_widget_get_pango_context
gtk_widget_create_pango_layout
gtk_widget_render_stock_icon
gtk_widget_render_icon
gtk_widget_pop_composite_child
gtk_widget_push_composite_child
gtk_widget_queue_clear
......
......@@ -1626,6 +1626,26 @@ Given the type of an object and a pointer to it, the object is freed.
</para>
<!-- ##### STRUCT GtkStatusbarMsg ##### -->
<para>
Holds the data for a statusbar message. <structfield>text</structfield> holds the actual text string. <structfield>context_id</structfield> is the context that this message is associated with, and <structfield>message_id</structfield> is this particular message's identifier. However, these fields should not be modified directly.
</para>
@text:
@context_id:
@message_id:
<!-- ##### FUNCTION gtk_widget_render_stock_icon ##### -->
<para>
</para>
@widget:
@stock_id:
@size:
@detail:
@Returns:
<!-- ##### SECTION ./tmpl/gtkprivate.sgml:Title ##### -->
Private Information
......@@ -1943,6 +1963,12 @@ be used to bypass it.
</para>
<!-- ##### STRUCT GtkLabelWord ##### -->
<para>
Internal to #GtkLabel.
</para>
<!-- ##### FUNCTION gtk_text_buffer_spew ##### -->
<para>
......
......@@ -5,6 +5,15 @@ GtkCurve
allows direct editing of a curve.
<!-- ##### SECTION Long_Description ##### -->
<para>
NOTE this widget is considered too specialized/little-used for
GTK+, and will in the future be moved to some other package. If
your application needs this widget, feel free to use it, as the
widget does work and is useful in some applications; it's just not
of general interest. However, we are not accepting new features for
the widget, and it will eventually move out of the GTK+
distribution.
</para>
<para>
The #GtkCurve widget allows the user to edit a curve covering a range of
values. It is typically used to fine-tune color balances in graphics
......
......@@ -5,6 +5,15 @@ GtkGammaCurve
a subclass of #GtkCurve for editing gamma curves.
<!-- ##### SECTION Long_Description ##### -->
<para>
NOTE this widget is considered too specialized/little-used for
GTK+, and will in the future be moved to some other package. If
your application needs this widget, feel free to use it, as the
widget does work and is useful in some applications; it's just not
of general interest. However, we are not accepting new features for
the widget, and it will eventually move out of the GTK+
distribution.
</para>
<para>
The #GtkGammaCurve widget is a subclass of #GtkCurve specifically for
editing gamma curves, which are used in graphics applications such as the
......
......@@ -5,6 +5,15 @@ GtkHRuler
A horizontal ruler.
<!-- ##### SECTION Long_Description ##### -->
<para>
NOTE this widget is considered too specialized/little-used for
GTK+, and will in the future be moved to some other package. If
your application needs this widget, feel free to use it, as the
widget does work and is useful in some applications; it's just not
of general interest. However, we are not accepting new features for
the widget, and it will eventually move out of the GTK+
distribution.
</para>
<para>
The HRuler widget is a widget arranged horizontally creating a ruler that is
utilized around other widgets such as a text widget. The ruler is used to show
......
......@@ -3,10 +3,28 @@ Themeable Stock Images
<!-- ##### SECTION Short_Description ##### -->
Manipulating stock icons
<!-- ##### SECTION Long_Description ##### -->
<para>
An icon factory manages a collection of #GtkIconSet; a #GtkIconSet manages a
set of variants of a particular icon (i.e. a #GtkIconSet contains variants for
different sizes and widget states). Icons in an icon factory are named by a
stock ID, which is a simple string identifying the icon. Each #GtkStyle has a
list of #GtkIconFactory derived from the current theme; those icon factories
are consulted first when searching for an icon. If the theme doesn't set a
particular icon, GTK+ looks for the icon in a list of default icon factories,
maintained by gtk_icon_factory_add_default() and
gtk_icon_factory_remove_default(). Applications with icons should add a default
icon factory with their icons, which will allow themes to override the icons
for the application.
</para>
<para>
To display an icon, always use gtk_style_lookup_icon_set() on the widget that
will display the icon, or the convenience function
gtk_widget_render_icon(). These functions take the theme into account when
looking up the icon to use for a given stock ID.
</para>
<!-- ##### SECTION See_Also ##### -->
......
......@@ -5,6 +5,16 @@ GtkInputDialog
Configure devices for the XInput extension.
<!-- ##### SECTION Long_Description ##### -->
<para>
NOTE this widget is considered too specialized/little-used for
GTK+, and will in the future be moved to some other package. If
your application needs this widget, feel free to use it, as the
widget does work and is useful in some applications; it's just not
of general interest. However, we are not accepting new features for
the widget, and it will eventually move out of the GTK+
distribution.
</para>
<para>
#GtkInputDialog displays a dialog which allows the user
to configure XInput extension devices. For each
......
......@@ -24,12 +24,6 @@ described below.
</para>
<!-- ##### STRUCT GtkLabelWord ##### -->
<para>
Internal to #GtkLabel.
</para>
<!-- ##### FUNCTION gtk_label_new ##### -->
<para>
Creates a new label with the given string of text inside it. You can
......
......@@ -5,6 +5,15 @@ GtkRuler
Base class for horizontal or vertical rulers
<!-- ##### SECTION Long_Description ##### -->
<para>
NOTE this widget is considered too specialized/little-used for
GTK+, and will in the future be moved to some other package. If
your application needs this widget, feel free to use it, as the
widget does work and is useful in some applications; it's just not
of general interest. However, we are not accepting new features for
the widget, and it will eventually move out of the GTK+
distribution.
</para>
<para>
The GTKRuler widget is a base class for horizontal and vertical rulers. Rulers
are used to show the mouse pointer's location in a window. The ruler can either
......
......@@ -50,15 +50,6 @@ Contains private data that should be modified with the functions described below
</para>
<!-- ##### STRUCT GtkStatusbarMsg ##### -->
<para>
Holds the data for a statusbar message. <structfield>text</structfield> holds the actual text string. <structfield>context_id</structfield> is the context that this message is associated with, and <structfield>message_id</structfield> is this particular message's identifier. However, these fields should not be modified directly.
</para>
@text:
@context_id:
@message_id:
<!-- ##### FUNCTION gtk_statusbar_new ##### -->
<para>
Creates a new #GtkStatusbar ready for messages.
......
......@@ -30,8 +30,10 @@ Stock Items
</para>
@item:
@items:
@n_items:
<!-- # Unused Parameters # -->
@item:
<!-- ##### FUNCTION gtk_stock_add_static ##### -->
......@@ -39,8 +41,10 @@ Stock Items
</para>
@item:
@items:
@n_items:
<!-- # Unused Parameters # -->
@item:
<!-- ##### FUNCTION gtk_stock_item_copy ##### -->
......
......@@ -334,6 +334,9 @@ types related to the text widget and how they work together.
@buffer:
@tag:
@start:
@end:
<!-- # Unused Parameters # -->
@start_index:
@end_index:
......@@ -345,6 +348,9 @@ types related to the text widget and how they work together.
@buffer:
@tag:
@start:
@end:
<!-- # Unused Parameters # -->
@start_index:
@end_index:
......@@ -356,6 +362,9 @@ types related to the text widget and how they work together.
@buffer:
@name:
@start:
@end:
<!-- # Unused Parameters # -->
@start_index:
@end_index:
......@@ -367,6 +376,9 @@ types related to the text widget and how they work together.
@buffer:
@name:
@start:
@end:
<!-- # Unused Parameters # -->
@start_index:
@end_index:
......
......@@ -203,6 +203,18 @@ GtkTreeView
@Returns:
<!-- ##### FUNCTION gtk_tree_view_scroll_to_cell ##### -->
<para>
</para>
@tree_view:
@path:
@column:
@row_align:
@col_align:
<!-- ##### FUNCTION gtk_tree_view_get_path_at_pos ##### -->
<para>
......
......@@ -151,6 +151,24 @@ GtkTreeViewColumn
@type:
<!-- ##### FUNCTION gtk_tree_view_column_get_sizing ##### -->
<para>
</para>
@tree_column:
@Returns:
<!-- ##### FUNCTION gtk_tree_view_column_get_width ##### -->
<para>
</para>
@tree_column:
@Returns:
<!-- ##### FUNCTION gtk_tree_view_column_set_width ##### -->
<para>
......@@ -214,6 +232,15 @@ GtkTreeViewColumn
@Returns:
<!-- ##### FUNCTION gtk_tree_view_column_set_clickable ##### -->
<para>
</para>
@tree_column:
@active:
<!-- ##### FUNCTION gtk_tree_view_column_set_widget ##### -->
<para>
......
......@@ -5,6 +5,15 @@ GtkVRuler
A vertical ruler.
<!-- ##### SECTION Long_Description ##### -->
<para>
NOTE this widget is considered too specialized/little-used for
GTK+, and will in the future be moved to some other package. If
your application needs this widget, feel free to use it, as the
widget does work and is useful in some applications; it's just not
of general interest. However, we are not accepting new features for
the widget, and it will eventually move out of the GTK+
distribution.
</para>
<para>
The VRuler widget is a widget arranged vertically creating a ruler that is
utilized around other widgets such as a text widget. The ruler is used to show
......
......@@ -1142,7 +1142,7 @@ GtkWidget
@Returns:
<!-- ##### FUNCTION gtk_widget_render_stock_icon ##### -->
<!-- ##### FUNCTION gtk_widget_render_icon ##### -->
<para>
</para>
......
......@@ -198,17 +198,23 @@ gtk_cell_renderer_set_property (GObject *object,
}
}
/**
* gtk_cell_renderer_get_size:
* @cell: a #GtkCellRenderer
* @widget: the widget the renderer is rendering to
* @width: location to return width needed to render a cell, or %NULL
* @height: location to return height needed to render a cell, or %NULL
*
* Obtains the width and height needed to render the cell. Used by
* view widgets to determine the appropriate size for the cell_area
* passed to gtk_cell_renderer_render().
**/
void
gtk_cell_renderer_get_size (GtkCellRenderer *cell,
GtkWidget *widget,
gint *width,
gint *height)
{
/* It's actually okay to pass in a NULL cell, as we run into that
* a lot
*/
if (cell == NULL)
return;
g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
g_return_if_fail (GTK_CELL_RENDERER_GET_CLASS (cell)->get_size != NULL);
......@@ -262,6 +268,22 @@ gtk_cell_renderer_render (GtkCellRenderer *cell,
flags);
}
/**
* gtk_cell_renderer_event:
* @cell: a #GtkCellRenderer
* @event: a #GdkEvent
* @widget: widget that received the event
* @path: widget-dependent string representation of the event location; e.g. for #GtkTreeView, a string representation of #GtkTreePath
* @background_area: background area as passed to gtk_cell_renderer_render()
* @cell_area: cell area as passed to gtk_cell_renderer_render()
* @flags: render flags
*
* Passes an event to the cell renderer for possible processing. Some
* cell renderers may use events; for example, #GtkCellRendererToggle
* toggles when it gets a mouse click.
*
* Return value: %TRUE if the event was consumed/handled
**/
gint
gtk_cell_renderer_event (GtkCellRenderer *cell,
GdkEvent *event,
......
......@@ -153,6 +153,19 @@ gtk_cell_renderer_pixbuf_set_property (GObject *object,
}
}
/**
* gtk_cell_renderer_pixbuf_new:
*
* Creates a new #GtkCellRendererPixbuf. Adjust rendering
* parameters using object properties. Object properties can be set
* globally (with g_object_set()). Also, with #GtkTreeViewColumn, you
* can bind a property to a value in a #GtkTreeModel. For example, you
* can bind the "pixbuf" property on the cell renderer to a pixbuf value
* in the model, thus rendering a different image in each row of the
* #GtkTreeView.
*
* Return value: the new cell renderer
**/
GtkCellRenderer *
gtk_cell_renderer_pixbuf_new (void)
{
......
......@@ -331,6 +331,19 @@ gtk_cell_renderer_text_set_property (GObject *object,
}
}
/**
* gtk_cell_renderer_text_new:
*
* Creates a new #GtkCellRendererText. Adjust how text is drawn using
* object properties. Object properties can be
* set globally (with g_object_set()). Also, with #GtkTreeViewColumn,
* you can bind a property to a value in a #GtkTreeModel. For example,
* you can bind the "text" property on the cell renderer to a string
* value in the model, thus rendering a different string in each row
* of the #GtkTreeView
*
* Return value: the new cell renderer
**/
GtkCellRenderer *
gtk_cell_renderer_text_new (void)
{
......
......@@ -217,7 +217,6 @@ gtk_cell_renderer_text_pixbuf_get_property (GObject *object,
}
}
static void
gtk_cell_renderer_text_pixbuf_set_property (GObject *object,
guint param_id,
......@@ -263,6 +262,19 @@ gtk_cell_renderer_text_pixbuf_set_property (GObject *object,
}
}
/**
* gtk_cell_renderer_text_pixbuf_new:
*
* Creates a new #GtkCellRendererTextPixbuf. Adjust rendering
* parameters using object properties. Object properties can be set
* globally (with g_object_set()). Also, with #GtkTreeViewColumn, you
* can bind a property to a value in a #GtkTreeModel. For example, you
* can bind the "text" property on the cell renderer to a string value
* in the model, thus rendering a different string in each row of the
* #GtkTreeView
*
* Return value: the new cell renderer
**/
GtkCellRenderer *
gtk_cell_renderer_text_pixbuf_new (void)
{
......
......@@ -184,7 +184,7 @@ gtk_cell_renderer_toggle_set_property (GObject *object,
switch (param_id)
{
case PROP_ACTIVE:
gtk_cell_renderer_toggle_set_active (celltoggle, g_value_get_boolean (value));
celltoggle->active = g_value_get_boolean (value);
break;
case PROP_RADIO:
celltoggle->radio = g_value_get_boolean (value);
......@@ -195,6 +195,19 @@ gtk_cell_renderer_toggle_set_property (GObject *object,
}
}
/**
* gtk_cell_renderer_toggle_new:
*
* Creates a new #GtkCellRendererToggle. Adjust rendering
* parameters using object properties. Object properties can be set
* globally (with g_object_set()). Also, with #GtkTreeViewColumn, you
* can bind a property to a value in a #GtkTreeModel. For example, you
* can bind the "active" property on the cell renderer to a boolean value
* in the model, thus causing the check button to reflect the state of
* the model.
*
* Return value: the new cell renderer
**/
GtkCellRenderer *
gtk_cell_renderer_toggle_new (void)
{
......@@ -299,35 +312,38 @@ gtk_cell_renderer_toggle_event (GtkCellRenderer *cell,
return retval;
}
/**
* gtk_cell_renderer_toggle_set_radio:
* @toggle: a #GtkCellRendererToggle
* @radio: %TRUE to make the toggle look like a radio button
*
* If @radio is %TRUE, the cell renderer renders a radio toggle
* (i.e. a toggle in a group of mutually-exclusive toggles).
* If %FALSE, it renders a check toggle (a standalone boolean option).
* This can be set globally for the cell renderer, or changed just
* before rendering each cell in the model (for #GtkTreeView, you set
* up a per-row setting using #GtkTreeViewColumn to associate model
* columns with cell renderer properties).
**/
void
gtk_cell_renderer_toggle_set_radio (GtkCellRendererToggle *toggle,
gboolean radio)
{
g_return_if_fail (toggle != NULL);
g_return_if_fail (GTK_IS_CELL_RENDERER_TOGGLE (toggle));
toggle->radio = radio;
}
/**
* gtk_cell_renderer_toggle_get_radio:
* @toggle: a #GtkCellRendererToggle
*
* Return value: %TRUE if we're rendering radio toggles rather than checkboxes
**/
gboolean
gtk_cell_renderer_toggle_get_active (GtkCellRendererToggle *toggle)
gtk_cell_renderer_toggle_get_radio (GtkCellRendererToggle *toggle)
{
g_return_val_if_fail (GTK_IS_CELL_RENDERER_TOGGLE (toggle), FALSE);
return toggle->active;
}
void
gtk_cell_renderer_toggle_set_active (GtkCellRendererToggle *toggle,
gboolean setting)
{
g_return_if_fail (GTK_IS_CELL_RENDERER_TOGGLE (toggle));
setting = !! setting;
if (toggle->active != setting)
{
toggle->active = setting;
g_object_notify (G_OBJECT (toggle), "active");
}
return toggle->radio;
}