Commit c26e3eee authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor
Browse files

Restore build.

Mon Jan  8 15:21:15 2001  Owen Taylor  <otaylor@redhat.com>

	* Makefile.am (SUBDIRS): Restore build.

	* gdk/gdk-sections.txt gdk/gdk-docs.sgml
	  gdk-pixbuf/gdk-pixbuf-sections.txt
	  gtk/gtk-sections.txt gtk/gtk-docs.sgml: : Update.

	* */tmpl/*: Changes from update.
parent a801ea7b
Mon Jan 8 15:21:15 2001 Owen Taylor <otaylor@redhat.com>
* Makefile.am (SUBDIRS): Restore build.
* gdk/gdk-sections.txt gdk/gdk-docs.sgml
gdk-pixbuf/gdk-pixbuf-sections.txt
gtk/gtk-sections.txt gtk/gtk-docs.sgml: : Update.
* */tmpl/*: Changes from update.
Wed Oct 25 15:19:40 2000 Owen Taylor <otaylor@redhat.com>
* gtk/tmpl/gtknotebook.sgml: Moved function docs into .c
......
## Process this file with automake to produce Makefile.in
# SUBDIRS = gdk-pixbuf gdk gtk
SUBDIRS = gdk-pixbuf gdk gtk
......@@ -88,6 +88,8 @@ gdk_pixbuf_animation_get_frames
gdk_pixbuf_animation_get_width
gdk_pixbuf_animation_get_num_frames
gdk_pixbuf_animation_get_height
gdk_pixbuf_frame_copy
gdk_pixbuf_frame_free
gdk_pixbuf_frame_get_pixbuf
gdk_pixbuf_frame_get_action
gdk_pixbuf_frame_get_y_offset
......@@ -98,8 +100,10 @@ gdk_pixbuf_frame_get_x_offset
GDK_PIXBUF_ANIMATION
GDK_TYPE_PIXBUF_ANIMATION
GDK_IS_PIXBUF_ANIMATION
GDK_TYPE_PIXBUF_FRAME
<SUBSECTION Private>
gdk_pixbuf_frame_get_type
gdk_pixbuf_animation_get_type
</SECTION>
......
......@@ -98,6 +98,27 @@ 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>
......
......@@ -85,5 +85,7 @@ creating
@pixbuf:
@Returns:
<!-- # Unused Parameters # -->
@src:
......@@ -13,12 +13,13 @@
<!entity gdk-Selections SYSTEM "sgml/selections.sgml">
<!entity gdk-Properties-and-Atoms SYSTEM "sgml/properties.sgml">
<!entity gdk-Input-Methods SYSTEM "sgml/input_methods.sgml">
<!entity gdk-Input-Contexts SYSTEM "sgml/input_contexts.sgml">
<!entity gdk-Pango-Interaction SYSTEM "sgml/pango_interaction.sgml">
<!entity gdk-Input-Contexts SYSTEM "sgml/input_contexts.sgml">
<!entity gdk-Color-Contexts SYSTEM "sgml/color_contexts.sgml">
<!entity gdk-Points-Rectangles-and-Regions SYSTEM "sgml/regions.sgml">
<!entity gdk-Threads SYSTEM "sgml/threads.sgml">
<!entity gdk-Key-Values SYSTEM "sgml/keys.sgml">
<!entity gdk-Keyboard-Handling SYSTEM "sgml/gdkkeys.sgml">
<!entity gdk-Input-Devices SYSTEM "sgml/input_devices.sgml">
<!entity gdk-Events SYSTEM "sgml/events.sgml">
<!entity gdk-Event-Structures SYSTEM "sgml/event_structs.sgml">
......@@ -69,7 +70,7 @@
&gdk-Input-Devices;
&gdk-Key-Values;
&gdk-Keyboard-Handling;
&gdk-Pango-Interaction;
&gdk-Input-Methods;
......
......@@ -177,6 +177,7 @@ gdk_colormap_change
gdk_colormap_alloc_colors
gdk_colormap_alloc_color
gdk_colormap_free_colors
gdk_colormap_query_color
gdk_colormap_get_visual
gdk_colors_store
gdk_color_copy
......@@ -257,6 +258,8 @@ gdk_drawable_set_colormap
gdk_drawable_get_colormap
gdk_drawable_get_depth
gdk_drawable_get_size
gdk_drawable_get_clip_region
gdk_drawable_get_visible_region
<SUBSECTION>
gdk_draw_point
......@@ -640,23 +643,40 @@ gdk_threads_mutex
</SECTION>
<SECTION>
<TITLE>Key Values</TITLE>
<TITLE>Keyboard Handling</TITLE>
<FILE>keys</FILE>
gdk_keyval_name
gdk_keyval_from_name
GdkKeymap
GdkKeymapClass
GdkKeymapKey
GdkKeyInfo
gdk_keymap_get_default
gdk_keymap_lookup_key
gdk_keymap_translate_keyboard_state
gdk_keymap_get_entries_for_keyval
gdk_keymap_get_entries_for_keycode
<SUBSECTION>
gdk_keyval_is_upper
gdk_keyval_is_lower
gdk_keyval_name
gdk_keyval_from_name
<SUBSECTION>
gdk_keyval_convert_case
gdk_keyval_to_upper
gdk_keyval_to_lower
gdk_keyval_is_upper
gdk_keyval_is_lower
<SUBSECTION>
gdk_keyval_to_unicode
gdk_unicode_to_keyval
<SUBSECTION Standard>
GDK_KEYMAP
GDK_IS_KEYMAP
GDK_TYPE_KEYMAP
gdk_keymap_get_type
GDK_KEYMAP_CLASS
GDK_IS_KEYMAP_CLASS
GDK_KEYMAP_GET_CLASS
</SECTION>
<SECTION>
......@@ -709,6 +729,7 @@ gdk_event_put
gdk_event_copy
gdk_event_free
gdk_event_get_time
gdk_event_get_state
gdk_event_get_axis
<SUBSECTION>
......@@ -862,7 +883,6 @@ GDK_GC_X11_CLASS
GDK_IS_GC_X11_CLASS
GdkGCX11
GdkGCX11Class
GdkGCXData
GdkColormapPrivateX11
GdkCursorPrivate
GdkFontPrivateX
......
......@@ -121,6 +121,16 @@ Colormaps and Colors
@ncolors:
<!-- ##### FUNCTION gdk_colormap_query_color ##### -->
<para>
</para>
@colormap:
@pixel:
@result:
<!-- ##### FUNCTION gdk_colormap_get_visual ##### -->
<para>
......
......@@ -111,6 +111,24 @@ 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>
......
......@@ -226,6 +226,16 @@ Gets the timestamp from a #GdkEvent.
no timestamp.
<!-- ##### FUNCTION gdk_event_get_state ##### -->
<para>
</para>
@event:
@state:
@Returns:
<!-- ##### FUNCTION gdk_event_get_axis ##### -->
<para>
......
<!-- ##### FUNCTION gdk_input_set_mode ##### -->
<para>
Enables or disables a device, and determines how the
device maps onto the screen.
</para>
@deviceid: the device to configure.
@mode: the new mode.
@Returns: %TRUE if the device supports the given mode, otherwise
%FALSE and the device's mode is unchanged.
<!-- ##### FUNCTION gdk_input_set_key ##### -->
<!-- ##### SECTION ./tmpl/gdkregion.sgml:See_Also ##### -->
<para>
Sets the key event generated when a macro button is pressed.
</para>
@deviceid: the device to configure.
@index: the index of the macro button.
@keyval: the key value for the #GdkKeypressEvent to generate.
(a value of 0 means no event will be generated.)
@modifiers: the modifier field for the generated
#GdkKeyPressEvent.
<!-- ##### FUNCTION gdk_regions_intersect ##### -->
<para>
Returns the intersection of two regions.
</para>
@source1: a #GdkRegion.
@source2: a #GdkRegion.
@Returns: the intersection of @source1 and @source2.
<!-- ##### FUNCTION gdk_regions_xor ##### -->
<para>
......@@ -42,32 +16,33 @@ but which are not in both.
@Returns: the difference between the union and the intersection of @source1
and @source2.
<!-- ##### FUNCTION gdk_regions_subtract ##### -->
<!-- ##### FUNCTION gdk_input_motion_events ##### -->
<para>
Subtracts one region from another.
The result is a region containing all the pixels which are in @source1, but
which are not in @source2.
Retrieves the motion history for a given device/window pair.
</para>
@source1: a #GdkRegion.
@source2: a #GdkRegion to subtract from @source1.
@Returns: @source1 - @source2.
@window: a #GdkWindow.
@deviceid: the device for which to retrieve motion history.
@start: the start time.
@stop: the stop time.
@nevents_return: location to store the number of events returned.
@Returns: a newly allocated array containing all the events
from @start to @stop. This array should be freed
with g_free() when you are finished using it.
<!-- ##### FUNCTION gdk_input_list_devices ##### -->
<!-- ##### SECTION ./tmpl/gdkkeys.sgml:See_Also ##### -->
<para>
Lists all available input devices, along with their
configuration information.
</para>
@Returns: A #GList of #GdkDeviceInfo structures. This list
is internal data of GTK+ and should not be modified
or freed.
<!-- ##### SECTION ./tmpl/gdkregion.sgml:Short_Description ##### -->
<!-- ##### SECTION ./tmpl/gdkregion.sgml:Long_Description ##### -->
<para>
</para>
<!-- ##### SECTION ./tmpl/input_methods.sgml.sgml:See_Also ##### -->
<!-- ##### SECTION ./tmpl/gdkkeys.sgml:Long_Description ##### -->
<para>
</para>
......@@ -77,23 +52,6 @@ configuration information.
<!-- ##### MACRO GDK_CORE_POINTER ##### -->
<para>
This macro contains an integer value representing
the device ID for the core pointer device.
</para>
<!-- ##### FUNCTION gdk_input_set_axes ##### -->
<para>
Sets the mapping of the axes (valuators) of a device
onto the predefined valuator types that GTK+ understands.
</para>
@deviceid: the device to configure.
@axes: an array of GdkAxisUse. This length of this array
must match the number of axes for the device.
<!-- ##### STRUCT GdkDeviceInfo ##### -->
<para>
The #GdkDeviceInfo structure contains information about a
......@@ -118,63 +76,70 @@ device. It has the following fields:
which describe what key press events are generated
for each macro button.
<!-- ##### SECTION ./tmpl/gdkregion.sgml:Title ##### -->
Points, Rectangles and Regions
<!-- ##### SECTION ./tmpl/input_methods.sgml.sgml:Title ##### -->
Pango Interaction
<!-- ##### SECTION ./tmpl/input_methods.sgml.sgml:Long_Description ##### -->
<!-- ##### FUNCTION gdk_regions_union ##### -->
<para>
Returns the union of two regions.
This is all pixels in either of @source1 or @source2.
</para>
@source1: a #GdkRegion.
@source2: a #GdkRegion.
@Returns: the union of @source1 and @source2.
<!-- ##### ENUM GdkPixbufAlphaMode ##### -->
<para>
<!-- ##### SECTION ./tmpl/gdkregion.sgml:Short_Description ##### -->
</para>
@GDK_PIXBUF_ALPHA_BILEVEL:
@GDK_PIXBUF_ALPHA_FULL:
<!-- ##### FUNCTION gdk_input_motion_events ##### -->
<!-- ##### FUNCTION gdk_input_set_key ##### -->
<para>
Retrieves the motion history for a given device/window pair.
Sets the key event generated when a macro button is pressed.
</para>
@window: a #GdkWindow.
@deviceid: the device for which to retrieve motion history.
@start: the start time.
@stop: the stop time.
@nevents_return: location to store the number of events returned.
@Returns: a newly allocated array containing all the events
from @start to @stop. This array should be freed
with g_free() when you are finished using it.
@deviceid: the device to configure.
@index: the index of the macro button.
@keyval: the key value for the #GdkKeypressEvent to generate.
(a value of 0 means no event will be generated.)
@modifiers: the modifier field for the generated
#GdkKeyPressEvent.
<!-- ##### SECTION ./tmpl/gdkregion.sgml:See_Also ##### -->
<!-- ##### FUNCTION gdk_input_list_devices ##### -->
<para>
Lists all available input devices, along with their
configuration information.
</para>
@Returns: A #GList of #GdkDeviceInfo structures. This list
is internal data of GTK+ and should not be modified
or freed.
<!-- ##### SECTION ./tmpl/input_methods.sgml.sgml:Title ##### -->
Pango Interaction
<!-- ##### SECTION ./tmpl/input_methods.sgml.sgml:See_Also ##### -->
<para>
</para>
<!-- ##### SECTION ./tmpl/gdkregion.sgml:Long_Description ##### -->
<!-- ##### ENUM GdkPixbufAlphaMode ##### -->
<para>
</para>
@GDK_PIXBUF_ALPHA_BILEVEL:
@GDK_PIXBUF_ALPHA_FULL:
<!-- ##### FUNCTION gdk_regions_union ##### -->
<!-- ##### FUNCTION gdk_regions_subtract ##### -->
<para>
Returns the union of two regions.
This is all pixels in either of @source1 or @source2.
Subtracts one region from another.
The result is a region containing all the pixels which are in @source1, but
which are not in @source2.
</para>
@source1: a #GdkRegion.
@source2: a #GdkRegion.
@Returns: the union of @source1 and @source2.
@source2: a #GdkRegion to subtract from @source1.
@Returns: @source1 - @source2.
<!-- ##### FUNCTION gdk_input_window_get_pointer ##### -->
<para>
......@@ -193,6 +158,27 @@ they will be ignored.
@ytilt: location to store current tilt in the y direction.
@mask: location to store the current modifier state.
<!-- ##### SECTION ./tmpl/gdkkeys.sgml:Short_Description ##### -->
<!-- ##### MACRO GDK_CORE_POINTER ##### -->
<para>
This macro contains an integer value representing
the device ID for the core pointer device.
</para>
<!-- ##### FUNCTION gdk_input_set_axes ##### -->
<para>
Sets the mapping of the axes (valuators) of a device
onto the predefined valuator types that GTK+ understands.
</para>
@deviceid: the device to configure.
@axes: an array of GdkAxisUse. This length of this array
must match the number of axes for the device.
<!-- ##### FUNCTION gdk_input_set_source ##### -->
<para>
Sets the source type for a device.
......@@ -201,3 +187,37 @@ Sets the source type for a device.
@deviceid: the device to configure
@source: the new source type.
<!-- ##### SECTION ./tmpl/gdkregion.sgml:Title ##### -->
Points, Rectangles and Regions
<!-- ##### FUNCTION gdk_regions_intersect ##### -->
<para>
Returns the intersection of two regions.
</para>
@source1: a #GdkRegion.
@source2: a #GdkRegion.
@Returns: the intersection of @source1 and @source2.
<!-- ##### SECTION ./tmpl/gdkkeys.sgml:Title ##### -->
Keyboard Handling
<!-- ##### FUNCTION gdk_input_set_mode ##### -->
<para>
Enables or disables a device, and determines how the
device maps onto the screen.
</para>
@deviceid: the device to configure.
@mode: the new mode.
@Returns: %TRUE if the device supports the given mode, otherwise
%FALSE and the device's mode is unchanged.
<!-- ##### SECTION ./tmpl/input_methods.sgml.sgml:Long_Description ##### -->
<para>
</para>
......@@ -29,6 +29,96 @@ 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.
......@@ -51,26 +141,6 @@ Converts a key name to a key value.
not a valid key.
<!-- ##### FUNCTION gdk_keyval_is_upper ##### -->
<para>
Returns TRUE if the given key value is in upper case.
</para>