From 856a93cb85172b43ff469118121aa79fbcaf552f Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sun, 23 Dec 2001 22:55:17 +0000 Subject: [PATCH] Add gtktextutil.h Sat Dec 22 18:18:07 2001 Owen Taylor * gtk/Makefile.am (IGNORE_HFILES): Add gtktextutil.h * gtk/text_widget.sgml (linkend): SGML fixes. * gtk/gtk-sections.txt: Update * gdk/gdk-sections.txt: Update. * gdk/tmpl/cursors.sgml: SGML fix. * gdk/gdk-docs.sgml: Add PNG handling magic. --- docs/reference/ChangeLog | 14 +++ .../gdk-pixbuf/tmpl/refcounting.sgml | 2 +- docs/reference/gdk/gdk-docs.sgml | 3 + docs/reference/gdk/gdk-sections.txt | 27 ++++- docs/reference/gdk/tmpl/colors.sgml | 4 +- docs/reference/gdk/tmpl/cursors.sgml | 2 +- docs/reference/gdk/tmpl/dnd.sgml | 17 +-- docs/reference/gdk/tmpl/drawing.sgml | 6 - docs/reference/gdk/tmpl/fonts.sgml | 2 - docs/reference/gdk/tmpl/gcs.sgml | 47 ++++---- docs/reference/gdk/tmpl/gdk-unused.sgml | 86 ++++++-------- docs/reference/gdk/tmpl/general.sgml | 4 +- docs/reference/gdk/tmpl/input_devices.sgml | 16 +-- docs/reference/gdk/tmpl/keys.sgml | 17 +-- .../reference/gdk/tmpl/pango_interaction.sgml | 1 - docs/reference/gdk/tmpl/pixmaps.sgml | 6 +- docs/reference/gdk/tmpl/properties.sgml | 16 +++ docs/reference/gdk/tmpl/selections.sgml | 112 ++++++++++++++++++ docs/reference/gdk/tmpl/threads.sgml | 7 ++ docs/reference/gdk/tmpl/windows.sgml | 35 ++++-- docs/reference/gdk/tmpl/x_interaction.sgml | 36 ++++++ docs/reference/gtk/Makefile.am | 1 + docs/reference/gtk/gtk-sections.txt | 3 +- docs/reference/gtk/text_widget.sgml | 10 +- docs/reference/gtk/tmpl/gtk-unused.sgml | 25 +++- .../gtk/tmpl/gtkcellrendererpixbuf.sgml | 10 ++ docs/reference/gtk/tmpl/gtklabel.sgml | 2 +- docs/reference/gtk/tmpl/gtkrc.sgml | 4 +- docs/reference/gtk/tmpl/gtksettings.sgml | 5 + docs/reference/gtk/tmpl/gtksocket.sgml | 2 + docs/reference/gtk/tmpl/gtkstyle.sgml | 2 +- docs/reference/gtk/tmpl/gtktext.sgml | 6 - docs/reference/gtk/tmpl/gtktexttag.sgml | 12 +- docs/reference/gtk/tmpl/gtktextview.sgml | 38 ++++++ docs/reference/gtk/tmpl/gtktoolbar.sgml | 20 ++-- .../reference/gtk/tmpl/gtktreeviewcolumn.sgml | 14 --- docs/reference/gtk/tmpl/gtktypeutils.sgml | 2 +- 37 files changed, 420 insertions(+), 196 deletions(-) diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 0518ae96ff..df1f791994 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,17 @@ +Sat Dec 22 18:18:07 2001 Owen Taylor + + * gtk/Makefile.am (IGNORE_HFILES): Add gtktextutil.h + + * gtk/text_widget.sgml (linkend): SGML fixes. + + * gtk/gtk-sections.txt: Update + + * gdk/gdk-sections.txt: Update. + + * gdk/tmpl/cursors.sgml: SGML fix. + + * gdk/gdk-docs.sgml: Add PNG handling magic. + 2001-12-21 Matthias Clasen * gtk/text_widget.sgml: More precise wording. (#63388) diff --git a/docs/reference/gdk-pixbuf/tmpl/refcounting.sgml b/docs/reference/gdk-pixbuf/tmpl/refcounting.sgml index 403d4cc181..71521d38da 100644 --- a/docs/reference/gdk-pixbuf/tmpl/refcounting.sgml +++ b/docs/reference/gdk-pixbuf/tmpl/refcounting.sgml @@ -3,7 +3,7 @@ Reference Counting and Memory Mangement -Functions for reference counting and memory management on pixbufs. +Functions for reference counting and memory management on pixbufs. diff --git a/docs/reference/gdk/gdk-docs.sgml b/docs/reference/gdk/gdk-docs.sgml index 529abac025..67321178a8 100644 --- a/docs/reference/gdk/gdk-docs.sgml +++ b/docs/reference/gdk/gdk-docs.sgml @@ -1,4 +1,7 @@ + + diff --git a/docs/reference/gdk/gdk-sections.txt b/docs/reference/gdk/gdk-sections.txt index 493bc693e1..0974d0f599 100644 --- a/docs/reference/gdk/gdk-sections.txt +++ b/docs/reference/gdk/gdk-sections.txt @@ -483,6 +483,7 @@ GdkWindowEdge GdkWindowTypeHint GdkWindowAttr GdkWindowAttributesType +GdkScreen gdk_window_new gdk_window_destroy gdk_window_ref @@ -527,6 +528,7 @@ gdk_window_end_paint gdk_window_invalidate_rect gdk_window_invalidate_region +gdk_window_invalidate_maybe_recurse gdk_window_get_update_area gdk_window_freeze_updates gdk_window_thaw_updates @@ -629,16 +631,35 @@ GdkWindowObjectClass GdkSelection GdkSelectionType GdkTarget +GDK_SELECTION_PRIMARY +GDK_SELECTION_SECONDARY +GDK_SELECTION_CLIPBOARD +GDK_TARGET_BITMAP +GDK_TARGET_COLORMAP +GDK_TARGET_DRAWABLE +GDK_TARGET_PIXMAP +GDK_TARGET_STRING +GDK_SELECTION_TYPE_ATOM +GDK_SELECTION_TYPE_BITMAP +GDK_SELECTION_TYPE_COLORMAP +GDK_SELECTION_TYPE_DRAWABLE +GDK_SELECTION_TYPE_INTEGER +GDK_SELECTION_TYPE_PIXMAP +GDK_SELECTION_TYPE_WINDOW +GDK_SELECTION_TYPE_STRING gdk_selection_owner_set gdk_selection_owner_get gdk_selection_convert gdk_selection_property_get gdk_selection_send_notify +
Properties and Atoms properties GdkAtom +GDK_ATOM_TO_POINTER +GDK_POINTER_TO_ATOM GDK_NONE gdk_text_property_to_text_list gdk_free_text_list @@ -726,6 +747,7 @@ gdk_rectangle_get_type threads GDK_THREADS_ENTER GDK_THREADS_LEAVE +gdk_threads_init gdk_threads_enter gdk_threads_leave gdk_threads_mutex @@ -736,7 +758,6 @@ gdk_threads_mutex keys GdkKeymap GdkKeymapKey -GdkKeyInfo gdk_keymap_get_default gdk_keymap_lookup_key gdk_keymap_translate_keyboard_state @@ -1033,6 +1054,10 @@ gdk_x11_image_get_xdisplay gdk_x11_image_get_ximage gdk_x11_ungrab_server gdk_x11_visual_get_xvisual +gdk_x11_atom_to_xatom +gdk_x11_xatom_to_atom +gdk_x11_get_xatom_by_name +gdk_x11_get_xatom_name gdk_display diff --git a/docs/reference/gdk/tmpl/colors.sgml b/docs/reference/gdk/tmpl/colors.sgml index 8f5fa1eb26..e684089b1a 100644 --- a/docs/reference/gdk/tmpl/colors.sgml +++ b/docs/reference/gdk/tmpl/colors.sgml @@ -57,7 +57,6 @@ allocated or unallocated color. @green: The blue component of the color. @blue: The green component of the color. - The colormap structure contains the following public fields. @@ -71,7 +70,6 @@ The colormap structure contains the following public fields. back to RGB values. This is only meaningful for pseudo-color colormaps. - Creates a new colormap for the given visual. @@ -90,7 +88,7 @@ Creates a new colormap for the given visual. @cmap: -@Returns: +@Returns: diff --git a/docs/reference/gdk/tmpl/cursors.sgml b/docs/reference/gdk/tmpl/cursors.sgml index b575b4a81c..a441471b25 100644 --- a/docs/reference/gdk/tmpl/cursors.sgml +++ b/docs/reference/gdk/tmpl/cursors.sgml @@ -76,7 +76,7 @@ The standard cursors available. @GDK_QUESTION_ARROW: @GDK_RIGHT_PTR: @GDK_RIGHT_SIDE: -@GDK_RIGHT_TEE: +@GDK_RIGHT_TEE: @GDK_RIGHTBUTTON: @GDK_RTL_LOGO: @GDK_SAILBOAT: diff --git a/docs/reference/gdk/tmpl/dnd.sgml b/docs/reference/gdk/tmpl/dnd.sgml index 0d6543c6ba..d9caae1325 100644 --- a/docs/reference/gdk/tmpl/dnd.sgml +++ b/docs/reference/gdk/tmpl/dnd.sgml @@ -128,7 +128,7 @@ This function is called by the drag source. @context: a #GdkDragContext. @dest_window: the new destination window, obtained by gdk_drag_find_window(). -@protocol: the DND protocol in use, obtained by gdk_drag_find_window(). +@protocol: the DND protocol in use, obtained by gdk_drag_find_window(). @x_root: the x position of the pointer in root coordinates. @y_root: the y position of the pointer in root coordinates. @suggested_action: the suggested action. @@ -172,9 +172,9 @@ which DND is done. @GDK_DRAG_PROTO_XDND: The Xdnd protocol. @GDK_DRAG_PROTO_ROOTWIN: An extension to the Xdnd protocol for unclaimed root window drops. -@GDK_DRAG_PROTO_NONE: no protocol. +@GDK_DRAG_PROTO_NONE: no protocol. @GDK_DRAG_PROTO_WIN32_DROPFILES: The simple WM_DROPFILES protocol. -@GDK_DRAG_PROTO_OLE2: The complex OLE2 DND protocol (not implemented). +@GDK_DRAG_PROTO_OLE2: The complex OLE2 DND protocol (not implemented). @GDK_DRAG_PROTO_LOCAL: Intra-application DND. @@ -191,11 +191,11 @@ A GdkDragContext holds information about a drag in progress. It is used on both source and destination sides. -@parent_instance: +@parent_instance: @protocol: the DND protocol which governs this drag. @is_source: %TRUE if the context is used on the source side. @source_window: the source of this drag. -@dest_window: the destination window of this drag. +@dest_window: the destination window of this drag. @targets: a list of targets offered by the source. @actions: a bitmask of actions proposed by the source when @suggested_action is %GDK_ACTION_ASK. @@ -203,7 +203,6 @@ drag in progress. It is used on both source and destination sides. @action: the action chosen by the destination. @start_time: a timestamp recording the start time of this drag. - Used in #GdkDragContext to indicate what the destination @@ -211,14 +210,14 @@ should do with the dropped data. @GDK_ACTION_DEFAULT: -@GDK_ACTION_COPY: Copy the data. +@GDK_ACTION_COPY: Copy the data. @GDK_ACTION_MOVE: Move the data, i.e. first copy it, then delete it from the source using the DELETE target of the X selection protocol. @GDK_ACTION_LINK: Add a link to the data. Note that this is only useful if source and destination agree on what it means. @GDK_ACTION_PRIVATE: Special action which tells the source that the destination will do something that the source doesn't understand. -@GDK_ACTION_ASK: Ask the user what to do with the data. +@GDK_ACTION_ASK: Ask the user what to do with the data. @@ -233,3 +232,5 @@ gdk_drag_motion() called by the drag source. @action: the selected action which will be taken when a drop happens, or 0 to indicate that a drop will not be accepted. @time: the timestamp for this operation. + + diff --git a/docs/reference/gdk/tmpl/drawing.sgml b/docs/reference/gdk/tmpl/drawing.sgml index 6dd8448f92..57a39f179d 100644 --- a/docs/reference/gdk/tmpl/drawing.sgml +++ b/docs/reference/gdk/tmpl/drawing.sgml @@ -34,12 +34,6 @@ or a #GdkWindow. @user_data: - - - - - - diff --git a/docs/reference/gdk/tmpl/fonts.sgml b/docs/reference/gdk/tmpl/fonts.sgml index ca93630fc2..5a86237782 100644 --- a/docs/reference/gdk/tmpl/fonts.sgml +++ b/docs/reference/gdk/tmpl/fonts.sgml @@ -276,7 +276,6 @@ and is reference counted with gdk_font_ref() and gdk_font_unref() @descent: the maximum distance that the font, when drawn, descends below the baseline. - Indicates the type of a font. The possible values @@ -286,7 +285,6 @@ are currently: @GDK_FONT_FONT: the font is a single font. @GDK_FONT_FONTSET: the font is a fontset. - Loads a font. diff --git a/docs/reference/gdk/tmpl/gcs.sgml b/docs/reference/gdk/tmpl/gcs.sgml index f78584bdf2..aca26cda0c 100644 --- a/docs/reference/gdk/tmpl/gcs.sgml +++ b/docs/reference/gdk/tmpl/gcs.sgml @@ -44,19 +44,13 @@ elements. @ts_y_origin: @colormap: - - - - - - The #GdkGCValues structure holds a set of values used to create or modify a graphics context. -@foreground: the foreground color. +@foreground: the foreground color. @background: the background color. @font: the default font. @function: the bitwise operation used when drawing. @@ -81,7 +75,7 @@ A set of bit flags used to indicate which fields #GdkGCValues structure are set. -@GDK_GC_FOREGROUND: the @foreground is set. +@GDK_GC_FOREGROUND: the @foreground is set. @GDK_GC_BACKGROUND: the @background is set. @GDK_GC_FONT: the @font is set. @GDK_GC_FUNCTION: the @function is set. @@ -155,8 +149,8 @@ Create a new GC with the given initial values. -@gc: -@Returns: +@gc: +@Returns: @@ -164,7 +158,7 @@ Create a new GC with the given initial values. -@gc: +@gc: @@ -173,6 +167,7 @@ Identical to gdk_gc_unref(). This function is obsolete and should not be used. + @gc: a #GdkGC. @@ -268,16 +263,16 @@ Set the fill mode for a graphics context. Determines how primitives are drawn. -@GDK_SOLID: draw with the foreground color. +@GDK_SOLID: draw with the foreground color. @GDK_TILED: draw with a tiled pixmap. @GDK_STIPPLED: draw using the stipple bitmap. Pixels corresponding to bits in the stipple bitmap that are set will be drawn in the foreground color; pixels corresponding to bits that are - not set will be left untouched. + not set will be left untouched. @GDK_OPAQUE_STIPPLED: draw using the stipple bitmap. Pixels corresponding to bits in the stipple bitmap that are set will be drawn in the foreground color; pixels corresponding to bits that are - not set will be drawn with the background color. + not set will be drawn with the background color. @@ -410,37 +405,35 @@ explanations of the arguments. Determines how lines are drawn. -@GDK_LINE_SOLID: lines are drawn solid. -@GDK_LINE_ON_OFF_DASH: even segments are drawn; odd segments are not drawn. +@GDK_LINE_SOLID: lines are drawn solid. +@GDK_LINE_ON_OFF_DASH: even segments are drawn; odd segments are not drawn. @GDK_LINE_DOUBLE_DASH: even segments are normally. Odd segments are drawn in the background color if the fill style is %GDK_SOLID, or in the background color masked by the stipple if the fill style is %GDK_STIPPLED. - Determines how the end of lines are drawn. -@GDK_CAP_BUTT: the ends of the lines are drawn squared off and extending - to the coordinates of the end point. @GDK_CAP_NOT_LAST: the same as %GDK_CAP_BUTT for lines of non-zero width. - for zero width lines, the final point on the line will not be drawn. + for zero width lines, the final point on the line will not be drawn. +@GDK_CAP_BUTT: the ends of the lines are drawn squared off and extending + to the coordinates of the end point. @GDK_CAP_ROUND: the ends of the lines are drawn as semicircles with the - diameter equal to the line width and centered at the end point. + diameter equal to the line width and centered at the end point. @GDK_CAP_PROJECTING: the ends of the lines are drawn squared off and extending - half the width of the line beyond the end point. + half the width of the line beyond the end point. Determines how the joins between segments of a polygon are drawn. -@GDK_JOIN_MITER: the sides of each line are extended to meet at an angle. -@GDK_JOIN_ROUND: the sides of the two lines are joined by a circular arc. +@GDK_JOIN_MITER: the sides of each line are extended to meet at an angle. +@GDK_JOIN_ROUND: the sides of the two lines are joined by a circular arc. @GDK_JOIN_BEVEL: the sides of the two lines are joined by a straight line which - makes an equal angle with each line. - + makes an equal angle with each line. @@ -453,7 +446,7 @@ be changed with gdk_gc_set_line_attributes()) @gc: a #GdkGC. -@dash_offset: the +@dash_offset: the @dash_list: an array of dash lengths. @n: the number of elements in @dash_list. diff --git a/docs/reference/gdk/tmpl/gdk-unused.sgml b/docs/reference/gdk/tmpl/gdk-unused.sgml index e3290e914e..d6b6b6ae1e 100644 --- a/docs/reference/gdk/tmpl/gdk-unused.sgml +++ b/docs/reference/gdk/tmpl/gdk-unused.sgml @@ -138,59 +138,6 @@ support for internationalized text input. Input Methods - - -The X selection mechanism provides a way to transfer -arbitrary chunks of data between programs. -A selection is a essentially -a named clipboard, identified by a string interned -as a #GdkAtom. By claiming ownership of a selection, -an application indicates that it will be responsible -for supplying its contents. The most common -selections are PRIMARY and -CLIPBOARD. - - -The contents of a selection can be represented in -a number of formats, called targets. -Each target is identified by an atom. A list of -all possible targets supported by the selection owner -can be retrieved by requesting the special target -TARGETS. When a selection is -retrieved, the data is accompanied by a type -(an atom), and a format (an integer, representing -the number of bits per item). -See Properties and Atoms -for more information. - - -The functions in this section only contain the lowlevel -parts of the selection protocol. A considerably more -complicated implementation is needed on top of this. -GTK+ contains such an implementation in the functions -in gtkselection.h and programmers -should use those functions instead of the ones presented -here. If you plan to implement selection handling -directly on top of the functions here, you should refer -to the X Inter-client Communication Conventions Manual -(ICCCM). - - - - - - - - - - -functions for transfering data via the X selection mechanism. - - - -Selections - - This macro contains an integer value representing @@ -260,6 +207,12 @@ the device ID for the core pointer device. @GDK_CC_MODE_MY_GRAY: @GDK_CC_MODE_PALETTE: + + + + + + The #GdkDeviceInfo structure contains information about a @@ -284,6 +237,18 @@ device. It has the following fields: which describe what key press events are generated for each macro button. + + + + + + + + + + + + The #GdkIC struct is an opaque structure representing an input context @@ -465,6 +430,21 @@ status information, so the application does not need to do anything. @GDK_IM_STATUS_NONE: The input method does not display status information. @GDK_IM_STATUS_MASK: A bit-mask containing all the status flags. + + + + + +@keycode: +@group: +@level: + + + + + + + diff --git a/docs/reference/gdk/tmpl/general.sgml b/docs/reference/gdk/tmpl/general.sgml index bd20b4cbff..c4dbc3de2a 100644 --- a/docs/reference/gdk/tmpl/general.sgml +++ b/docs/reference/gdk/tmpl/general.sgml @@ -237,10 +237,10 @@ Returned by gdk_pointer_grab() and gdk_keyboard_grab() to indicate success or the reason for the failure of the grab attempt. -@GDK_GRAB_SUCCESS: the resource was successfully grabbed. +@GDK_GRAB_SUCCESS: the resource was successfully grabbed. @GDK_GRAB_ALREADY_GRABBED: the resource is actively grabbed by another client. @GDK_GRAB_INVALID_TIME: the resource was grabbed more recently than the - specified time. + specified time. @GDK_GRAB_NOT_VIEWABLE: the grab window or the @confine_to window are not viewable. @GDK_GRAB_FROZEN: the resource is frozen by an active grab of another client. diff --git a/docs/reference/gdk/tmpl/input_devices.sgml b/docs/reference/gdk/tmpl/input_devices.sgml index 4984726ad6..6af41e9dae 100644 --- a/docs/reference/gdk/tmpl/input_devices.sgml +++ b/docs/reference/gdk/tmpl/input_devices.sgml @@ -99,7 +99,7 @@ to configure various aspects of the device. @parent_instance: -@name: the name of this device. +@name: the name of this device. @source: the type of this device. @mode: the mode of this device @has_cursor: %TRUE if the pointer follows device motion. @@ -109,12 +109,6 @@ to configure various aspects of the device. @keys: an array of #GdkDeviceKey, describing the mapped macro buttons of this device. - - - - - - An enumeration describing the type of an input device @@ -159,7 +153,7 @@ about the range and mapping of a device axis. @use: specifies how the axis is used. -@min: the minimal value that will be reported by this axis. +@min: the minimal value that will be reported by this axis. @max: the maximal value that will be reported by this axis. @@ -257,9 +251,9 @@ Obtains the motion history for a device. @device: a #GdkDevice. -@window: the window wrt. which the event coordinates will be translated. -@start: only return events newer than this timestamp. -@stop: only return events older than this timestamp. +@window: the window wrt. which the event coordinates will be translated. +@start: only return events newer than this timestamp. +@stop: only return events older than this timestamp. @events: location to return a newly-allocated array of #GdkTimeCoord. @n_events: location to return the length of @events. @Returns: %TRUE if the @events were successfully filled. diff --git a/docs/reference/gdk/tmpl/keys.sgml b/docs/reference/gdk/tmpl/keys.sgml index b7236fd5d5..c1f2d482e9 100644 --- a/docs/reference/gdk/tmpl/keys.sgml +++ b/docs/reference/gdk/tmpl/keys.sgml @@ -91,12 +91,6 @@ in the keymap and see what keyval it corresponds to. @parent_instance: - - - - - - A GdkKeymapKey is a hardware key that can @@ -113,16 +107,7 @@ be mapped to a keyval. exclamation point ("!") character on it. The level indicates whether to use the "1" or the "!" symbol. The letter keys are considered to have a lowercase letter at level 0, and an uppercase letter at level 1, though only the - uppercase letter is printed. - - - - - - -@keycode: -@group: -@level: + uppercase letter is printed. diff --git a/docs/reference/gdk/tmpl/pango_interaction.sgml b/docs/reference/gdk/tmpl/pango_interaction.sgml index 48d6d65d9f..641972b659 100644 --- a/docs/reference/gdk/tmpl/pango_interaction.sgml +++ b/docs/reference/gdk/tmpl/pango_interaction.sgml @@ -40,7 +40,6 @@ rendering the text. @attr: the #PangoAttribute. @embossed: the embossed bitmap. - A Pango text attribute containing a stipple bitmap to be used when diff --git a/docs/reference/gdk/tmpl/pixmaps.sgml b/docs/reference/gdk/tmpl/pixmaps.sgml index 600b54fea0..85a722d44e 100644 --- a/docs/reference/gdk/tmpl/pixmaps.sgml +++ b/docs/reference/gdk/tmpl/pixmaps.sgml @@ -152,8 +152,9 @@ in which case a default color will be used. Deprecated equivalent of g_object_ref(). -@pixmap: a #GdkPixmap @Returns: @pixmap + +@pixmap: a #GdkPixmap @@ -161,6 +162,7 @@ Deprecated equivalent of g_object_ref(). Deprecated equivalent of g_object_unref(). + @pixmap: a #GdkPixmap @@ -180,6 +182,7 @@ Deprecated equivalent of g_object_ref(). @Returns: @pixmap + @pixmap: a #GdkBitmap @@ -188,6 +191,7 @@ Deprecated equivalent of g_object_ref(). Deprecated equivalent of g_object_unref(). + @pixmap: a #GdkBitmap diff --git a/docs/reference/gdk/tmpl/properties.sgml b/docs/reference/gdk/tmpl/properties.sgml index ea167278d4..fdefc57df2 100644 --- a/docs/reference/gdk/tmpl/properties.sgml +++ b/docs/reference/gdk/tmpl/properties.sgml @@ -49,6 +49,22 @@ of strings on the X server. + + + + + +@atom: + + + + + + + +@ptr: + + A null value for #GdkAtom, used in a similar way as None diff --git a/docs/reference/gdk/tmpl/selections.sgml b/docs/reference/gdk/tmpl/selections.sgml index 619a9f8f49..abf7dee937 100644 --- a/docs/reference/gdk/tmpl/selections.sgml +++ b/docs/reference/gdk/tmpl/selections.sgml @@ -77,6 +77,118 @@ compatibility with older programs. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Set the owner of the given selection. diff --git a/docs/reference/gdk/tmpl/threads.sgml b/docs/reference/gdk/tmpl/threads.sgml index 59a79ee86c..703e897471 100644 --- a/docs/reference/gdk/tmpl/threads.sgml +++ b/docs/reference/gdk/tmpl/threads.sgml @@ -54,6 +54,13 @@ begun with #GDK_THREADS_ENTER. + + + + + + + Enters a critical region like #GDK_THREADS_ENTER. diff --git a/docs/reference/gdk/tmpl/windows.sgml b/docs/reference/gdk/tmpl/windows.sgml index 177f4703c4..064a73395e 100644 --- a/docs/reference/gdk/tmpl/windows.sgml +++ b/docs/reference/gdk/tmpl/windows.sgml @@ -161,7 +161,7 @@ notes" section of the window manager hints specification for more details. -@GDK_GRAVITY_NORTH_WEST: the reference point is at the top left corner. +@GDK_GRAVITY_NORTH_WEST: the reference point is at the top left corner. @GDK_GRAVITY_NORTH: the reference point is in the middle of the top edge. @GDK_GRAVITY_NORTH_EAST: the reference point is at the top right corner. @GDK_GRAVITY_WEST: the reference point is at the middle of the left edge. @@ -173,7 +173,6 @@ window manager hints specification for more details. @GDK_GRAVITY_STATIC: the reference point is at the top left corner of the window itself, ignoring window manager decorations. - Determines a window edge or corner. @@ -188,7 +187,6 @@ Determines a window edge or corner. @GDK_WINDOW_EDGE_SOUTH: the lower edge. @GDK_WINDOW_EDGE_SOUTH_EAST: the lower right corner. - These are hints for the window manager that indicate what type of function @@ -240,6 +238,12 @@ corresponding flag in #GdkWindowAttributesType. @GDK_WA_WMCLASS: Honor the wmclass_class and wmclass_name fields @GDK_WA_NOREDIR: Honor the override_redirect field + + + + + + @@ -618,6 +622,17 @@ Registers a window as a potential drop destination. @invalidate_children: + + + + + +@window: +@region: +@child_func: +@user_data: + + @@ -844,6 +859,7 @@ window. + @@ -1023,10 +1039,10 @@ Hyper, Alt, Compose, Apple, CapsLock or ShiftLock. Like the X Window System, GDK supports 8 modifier keys and 5 mouse buttons. -@GDK_SHIFT_MASK: the Shift key. +@GDK_SHIFT_MASK: the Shift key. @GDK_LOCK_MASK: a Lock key (depending on the modifier mapping of the - X server this may either be CapsLock or ShiftLock). -@GDK_CONTROL_MASK: the Control key. + X server this may either be CapsLock or ShiftLock). +@GDK_CONTROL_MASK: the Control key. @GDK_MOD1_MASK: the fourth modifier key (it depends on the modifier mapping of the X server which key is interpreted as this modifier, but normally it is the Alt key). @@ -1040,11 +1056,11 @@ Like the X Window System, GDK supports 8 modifier keys and 5 mouse buttons. mapping of the X server which key is interpreted as this modifier). @GDK_BUTTON1_MASK: the first mouse button. @GDK_BUTTON2_MASK: the second mouse button. -@GDK_BUTTON3_MASK: the third mouse button. +@GDK_BUTTON3_MASK: the third mouse button. @GDK_BUTTON4_MASK: the fourth mouse button. @GDK_BUTTON5_MASK: the fifth mouse button. @GDK_RELEASE_MASK: not used in GDK itself. GTK+ uses it to differentiate - between (keyval, modifiers) pairs from key press and release events. + between (keyval, modifiers) pairs from key press and release events. @GDK_MODIFIER_MASK: @@ -1200,7 +1216,7 @@ The hint must be set before mapping the window. @GDK_FUNC_ALL: all functions should be offered. -@GDK_FUNC_RESIZE: the window should be resizable. +@GDK_FUNC_RESIZE: the window should be resizable. @GDK_FUNC_MOVE: the window should be movable. @GDK_FUNC_MINIMIZE: the window should be minimizable. @GDK_FUNC_MAXIMIZE: the window should be maximizable. @@ -1240,7 +1256,6 @@ Applications should never have any reason to use this facility returning the location of that window in @win_x, @win_y. Returns %NULL if the window under the mouse pointer is not known to GDK (for example, belongs to another application). - diff --git a/docs/reference/gdk/tmpl/x_interaction.sgml b/docs/reference/gdk/tmpl/x_interaction.sgml index 74353c1c0a..76086d2fd5 100644 --- a/docs/reference/gdk/tmpl/x_interaction.sgml +++ b/docs/reference/gdk/tmpl/x_interaction.sgml @@ -483,3 +483,39 @@ Returns the X visual belonging to a #GdkVisual. @Returns: an Xlib Visual*. + + + + + +@atom: +@Returns: + + + + + + + +@xatom: +@Returns: + + + + + + + +@atom_name: +@Returns: + + + + + + + +@xatom: +@Returns: + + diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am index 6714996aed..e7f4e0e90c 100644 --- a/docs/reference/gtk/Makefile.am +++ b/docs/reference/gtk/Makefile.am @@ -43,6 +43,7 @@ IGNORE_HFILES= \ gtktextsegment.h \ gtktexttagprivate.h \ gtktexttypes.h \ + gtktextutil.h \ gtktypebuiltins.h \ xembed.h diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt index e00f7952ae..05f32bde4a 100644 --- a/docs/reference/gtk/gtk-sections.txt +++ b/docs/reference/gtk/gtk-sections.txt @@ -2495,7 +2495,6 @@ gtk_text_mark_get_type gtktexttag GtkTextTag GtkTextTag -GtkTextBTreeNode GtkWrapMode GtkTextAttributes gtk_text_tag_new @@ -2574,6 +2573,7 @@ gtk_text_view_starts_display_line gtk_text_view_move_visually gtk_text_view_add_child_at_anchor GtkTextChildAnchor +GtkTextChildAnchorClass gtk_text_child_anchor_new gtk_text_child_anchor_get_widgets gtk_text_child_anchor_get_deleted @@ -3054,7 +3054,6 @@ gtk_tree_view_column_get_sort_order gtk_tree_view_column_cell_set_cell_data gtk_tree_view_column_cell_get_size gtk_tree_view_column_cell_render -gtk_tree_view_column_cell_event gtk_tree_view_column_cell_focus gtk_tree_view_column_cell_draw_focus gtk_tree_view_column_cell_is_visible diff --git a/docs/reference/gtk/text_widget.sgml b/docs/reference/gtk/text_widget.sgml index 64168b0cf9..b56b944262 100644 --- a/docs/reference/gtk/text_widget.sgml +++ b/docs/reference/gtk/text_widget.sgml @@ -183,8 +183,8 @@ For other attributes there are dedicated methods on pango_font_description_free (font_desc); /* Change default color throughout the widget */ - gdk_color_parse ("green", &color); - gtk_widget_modify_fg (view, GTK_STATE_NORMAL, &color); + gdk_color_parse ("green", &color); + gtk_widget_modify_fg (view, GTK_STATE_NORMAL, &color); /* Change left margin throughout the widget */ gtk_text_view_set_left_margin (GTK_TEXT_VIEW (view), 30); @@ -192,9 +192,9 @@ For other attributes there are dedicated methods on /* Use a tag to change the color for just one part of the widget */ tag = gtk_text_buffer_create_tag (buffer, "blue_foreground", "foreground", "blue", NULL); - gtk_text_buffer_get_iter_at_offset (buffer, &start, 7); - gtk_text_buffer_get_iter_at_offset (buffer, &end, 12); - gtk_text_buffer_apply_tag (buffer, tag, &start, &end); + gtk_text_buffer_get_iter_at_offset (buffer, &start, 7); + gtk_text_buffer_get_iter_at_offset (buffer, &end, 12); + gtk_text_buffer_apply_tag (buffer, tag, &start, &end); diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml index 18f30ffd8d..f1f87c9b25 100644 --- a/docs/reference/gtk/tmpl/gtk-unused.sgml +++ b/docs/reference/gtk/tmpl/gtk-unused.sgml @@ -1072,12 +1072,6 @@ after other user handlers and the default handler. - - - - - - A function which you can use to clean up when the @@ -1144,6 +1138,12 @@ Holds the data for a statusbar message. text holds th @context_id: @message_id: + + + + + + A #GtkJustification for the text. This is only used when the tag is @@ -2921,6 +2921,19 @@ a gtk_object_unref(). @tree_store: @n_columns: + + + + + +@tree_column: +@event: +@path_string: +@background_area: +@cell_area: +@flags: +@Returns: + diff --git a/docs/reference/gtk/tmpl/gtkcellrendererpixbuf.sgml b/docs/reference/gtk/tmpl/gtkcellrendererpixbuf.sgml index ec675c4220..b445f9d7b9 100644 --- a/docs/reference/gtk/tmpl/gtkcellrendererpixbuf.sgml +++ b/docs/reference/gtk/tmpl/gtkcellrendererpixbuf.sgml @@ -33,3 +33,13 @@ GtkCellRendererPixbuf + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtklabel.sgml b/docs/reference/gtk/tmpl/gtklabel.sgml index 2f9f2c8bbd..b3e18791f6 100644 --- a/docs/reference/gtk/tmpl/gtklabel.sgml +++ b/docs/reference/gtk/tmpl/gtklabel.sgml @@ -30,7 +30,7 @@ described below. @str: -@Returns: +@Returns: diff --git a/docs/reference/gtk/tmpl/gtkrc.sgml b/docs/reference/gtk/tmpl/gtkrc.sgml index e92248334c..77797b249f 100644 --- a/docs/reference/gtk/tmpl/gtkrc.sgml +++ b/docs/reference/gtk/tmpl/gtkrc.sgml @@ -773,12 +773,14 @@ otherwise %NULL. -@context: +@settings: @scanner: a #GtkScanner. Used for printing out warning messages if the file is not found. @pixmap_file: The name of the file to search for. @Returns: The filename, if found. (Must be freed with g_free()), otherwise %NULL. + +@context: diff --git a/docs/reference/gtk/tmpl/gtksettings.sgml b/docs/reference/gtk/tmpl/gtksettings.sgml index d246ff91f1..f0928cfbb8 100644 --- a/docs/reference/gtk/tmpl/gtksettings.sgml +++ b/docs/reference/gtk/tmpl/gtksettings.sgml @@ -196,6 +196,11 @@ GtkSettings + + + + + diff --git a/docs/reference/gtk/tmpl/gtksocket.sgml b/docs/reference/gtk/tmpl/gtksocket.sgml index c4c7ef97c4..2ef1948172 100644 --- a/docs/reference/gtk/tmpl/gtksocket.sgml +++ b/docs/reference/gtk/tmpl/gtksocket.sgml @@ -123,6 +123,8 @@ never be set by an application.) @socket: +@window_id: + @id: diff --git a/docs/reference/gtk/tmpl/gtkstyle.sgml b/docs/reference/gtk/tmpl/gtkstyle.sgml index 220aa57587..6502737cd4 100644 --- a/docs/reference/gtk/tmpl/gtkstyle.sgml +++ b/docs/reference/gtk/tmpl/gtkstyle.sgml @@ -14,7 +14,6 @@ Styles - Returns whether the styleis attached to a window. @@ -679,6 +678,7 @@ Returns whether the styleis attached to a window. @style: @window: +@state_type: @area: @widget: @detail: diff --git a/docs/reference/gtk/tmpl/gtktext.sgml b/docs/reference/gtk/tmpl/gtktext.sgml index 932742d727..38f98cd0c0 100644 --- a/docs/reference/gtk/tmpl/gtktext.sgml +++ b/docs/reference/gtk/tmpl/gtktext.sgml @@ -29,12 +29,6 @@ Most of the #GtkText-struct struct members should not be accessed directly. Listed below are a few exceptions and how to use them. -@hadj: Allows you to see the state of an attached horizontal #GtkScrollbar. - See #GtkAdjustment for more info. This allows easy access to the adjustments - of the #GtkText struct without having to keep track of ones that you - initialize at widget creation. -@vadj: Same as @hadj except it involves the vertical #GtkScrollbar. - diff --git a/docs/reference/gtk/tmpl/gtktexttag.sgml b/docs/reference/gtk/tmpl/gtktexttag.sgml index 399edd7b2e..f007f6b58c 100644 --- a/docs/reference/gtk/tmpl/gtktexttag.sgml +++ b/docs/reference/gtk/tmpl/gtktexttag.sgml @@ -27,12 +27,6 @@ types related to the text widget and how they work together. - - - - - - Describes a type of line wrapping. @@ -62,6 +56,7 @@ Describes a type of line wrapping. @tabs: @wrap_mode: @language: +@padding1: @invisible: @bg_full_height: @editable: @@ -120,11 +115,16 @@ Describes a type of line wrapping. @bg_stipple: @fg_stipple: @rise: +@padding1: @underline: @strikethrough: @draw_bg: @inside_selection: @is_text: +@pad1: +@pad2: +@pad3: +@pad4: diff --git a/docs/reference/gtk/tmpl/gtktextview.sgml b/docs/reference/gtk/tmpl/gtktextview.sgml index f122d3a605..99c5d23f87 100644 --- a/docs/reference/gtk/tmpl/gtktextview.sgml +++ b/docs/reference/gtk/tmpl/gtktextview.sgml @@ -323,6 +323,44 @@ types related to the text widget and how they work together. @anchor: + + + + + + + + + + + + + + + + + +@Returns: + + + + + + + +@anchor: +@Returns: + + + + + + + +@anchor: +@Returns: + + diff --git a/docs/reference/gtk/tmpl/gtktoolbar.sgml b/docs/reference/gtk/tmpl/gtktoolbar.sgml index 20ba84a1cc..0d511033da 100644 --- a/docs/reference/gtk/tmpl/gtktoolbar.sgml +++ b/docs/reference/gtk/tmpl/gtktoolbar.sgml @@ -163,7 +163,7 @@ be %NULL. @toolbar: a #GtkToolbar. @type: a value of type #GtkToolbarChildType that determines what @widget will be. -@widget: a #GtkWidget, or %NULL. +@widget: a #GtkWidget, or %NULL. @text: the element's label. @tooltip_text: the element's tooltip. @tooltip_private_text: used for context-sensitive help about this toolbar element. @@ -186,7 +186,7 @@ be %NULL. @toolbar: a #GtkToolbar. @type: a value of type #GtkToolbarChildType that determines what @widget will be. -@widget: a #GtkWidget, or %NULL +@widget: a #GtkWidget, or %NULL @text: the element's label. @tooltip_text: the element's tooltip. @tooltip_private_text: used for context-sensitive help about this toolbar element. @@ -201,17 +201,17 @@ be %NULL. -@toolbar: -@type: -@widget: +@toolbar: +@type: +@widget: @text: @tooltip_text: -@tooltip_private_text: -@icon: +@tooltip_private_text: +@icon: @callback: -@user_data: -@position: -@Returns: +@user_data: +@position: +@Returns: diff --git a/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml b/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml index 2c6ae85af3..61846d62fa 100644 --- a/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml +++ b/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml @@ -466,20 +466,6 @@ GtkTreeViewColumn @flags: - - - - - -@tree_column: -@event: -@path_string: -@background_area: -@cell_area: -@flags: -@Returns: - - diff --git a/docs/reference/gtk/tmpl/gtktypeutils.sgml b/docs/reference/gtk/tmpl/gtktypeutils.sgml index 70ba76d1e8..59c2bd6b3a 100644 --- a/docs/reference/gtk/tmpl/gtktypeutils.sgml +++ b/docs/reference/gtk/tmpl/gtktypeutils.sgml @@ -68,7 +68,7 @@ Returns the type of @class. Returns %TRUE if @type is a %GTK_TYPE_OBJECT. -@type: a #GtkType. +@type: a #GtkType.