From b9c479ba56df123e0b9e97ff6642bee667c3ee9a Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 19 Dec 2005 21:02:08 +0000 Subject: [PATCH] Small additions/fixes 2005-12-19 Matthias Clasen * gdk/tmpl/input.sgml: * gdk/tmpl/rgb.sgml: * gdk/tmpl/x_interaction.sgml: * gdk/tmpl/windows.sgml: Small additions/fixes * gdk/Makefile.am (IGNORE_HFILES): Add quartz * gdk/gdk-sections.txt: Add gdk_window_get_type_hint --- docs/reference/ChangeLog | 9 ++++++ docs/reference/gdk/Makefile.am | 3 +- docs/reference/gdk/gdk-sections.txt | 1 + docs/reference/gdk/tmpl/input.sgml | 28 +++---------------- docs/reference/gdk/tmpl/rgb.sgml | 32 ++++------------------ docs/reference/gdk/tmpl/windows.sgml | 12 ++++++-- docs/reference/gdk/tmpl/x_interaction.sgml | 2 +- 7 files changed, 32 insertions(+), 55 deletions(-) diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 9df0df2985..1ac1557d11 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,5 +1,14 @@ 2005-12-19 Matthias Clasen + * gdk/tmpl/input.sgml: + * gdk/tmpl/rgb.sgml: + * gdk/tmpl/x_interaction.sgml: + * gdk/tmpl/windows.sgml: Small additions/fixes + + * gdk/Makefile.am (IGNORE_HFILES): Add quartz + + * gdk/gdk-sections.txt: Add gdk_window_get_type_hint + * gtk/gtk-sections.txt: Add GtkStatusIcon so it gets an object hierarchy. diff --git a/docs/reference/gdk/Makefile.am b/docs/reference/gdk/Makefile.am index 7600c9820c..cb12716de3 100644 --- a/docs/reference/gdk/Makefile.am +++ b/docs/reference/gdk/Makefile.am @@ -32,7 +32,8 @@ IGNORE_HFILES= \ linux-fb \ nanox \ win32 \ - x11 + x11 \ + quartz # Extra files to add when scanning (relative to $srcdir) EXTRA_HFILES= \ diff --git a/docs/reference/gdk/gdk-sections.txt b/docs/reference/gdk/gdk-sections.txt index ebbc824ed8..44023dd608 100644 --- a/docs/reference/gdk/gdk-sections.txt +++ b/docs/reference/gdk/gdk-sections.txt @@ -708,6 +708,7 @@ gdk_window_set_geometry_hints gdk_window_set_icon_list gdk_window_set_modal_hint gdk_window_set_type_hint +gdk_window_get_type_hint gdk_window_set_skip_taskbar_hint gdk_window_set_skip_pager_hint gdk_window_set_urgency_hint diff --git a/docs/reference/gdk/tmpl/input.sgml b/docs/reference/gdk/tmpl/input.sgml index c8f1e26abc..49af128075 100644 --- a/docs/reference/gdk/tmpl/input.sgml +++ b/docs/reference/gdk/tmpl/input.sgml @@ -58,34 +58,14 @@ of this enumeration correspond to the @readfds, @writefds, and @exceptfds arguments to the select system call. - - - - - -GDK_INPUT_READ -the file descriptor has become available for reading. +@GDK_INPUT_READ: the file descriptor has become available for reading. (Or, as is standard in Unix, a socket or pipe was closed at the other end; this is the case if a subsequent read -on the file descriptor returns a count of zero.) - +on the file descriptor returns a count of zero.) - -GDK_INPUT_WRITE -the file descriptor has become available for writing. - +@GDK_INPUT_WRITE: the file descriptor has become available for writing. - -GDK_INPUT_EXCEPTION -an exception was raised on the file descriptor. - - - - - -@GDK_INPUT_READ: -@GDK_INPUT_WRITE: -@GDK_INPUT_EXCEPTION: +@GDK_INPUT_EXCEPTION: an exception was raised on the file descriptor. diff --git a/docs/reference/gdk/tmpl/rgb.sgml b/docs/reference/gdk/tmpl/rgb.sgml index 8654584819..1bd4f5c91a 100644 --- a/docs/reference/gdk/tmpl/rgb.sgml +++ b/docs/reference/gdk/tmpl/rgb.sgml @@ -278,40 +278,18 @@ start of the next. Selects whether or not GdkRGB applies dithering -to the image on display. There are three values: +to the image on display. - - - - -%GDK_RGB_DITHER_NONE: Never use dithering. - - - - - -%GDK_RGB_DITHER_NORMAL: Use dithering in 8 bits per pixel (and below) -only. - - - - - -%GDK_RGB_DITHER_MAX: Use dithering in 16 bits per pixel and below. - - - - - Since GdkRGB currently only handles images with 8 bits per component, dithering on 24 bit per pixel displays is a moot point. -@GDK_RGB_DITHER_NONE: -@GDK_RGB_DITHER_NORMAL: -@GDK_RGB_DITHER_MAX: +@GDK_RGB_DITHER_NONE: Never use dithering. +@GDK_RGB_DITHER_NORMAL: Use dithering in 8 bits per pixel (and below) +only. +@GDK_RGB_DITHER_MAX: Use dithering in 16 bits per pixel and below. diff --git a/docs/reference/gdk/tmpl/windows.sgml b/docs/reference/gdk/tmpl/windows.sgml index 6a49e718d7..787e296e8d 100644 --- a/docs/reference/gdk/tmpl/windows.sgml +++ b/docs/reference/gdk/tmpl/windows.sgml @@ -141,8 +141,7 @@ ratio. @min_width: minimum width of window (or -1 to use requisition, with #GtkWindow only) -@min_height minimum height of window (or -1 to use requisition, with #GtkWindow only) -@min_height: +@min_height: minimum height of window (or -1 to use requisition, with #GtkWindow only) @max_width: maximum width of window (or -1 to use requisition, with #GtkWindow only) @max_height: maximum height of window (or -1 to use requisition, with #GtkWindow only) @base_width: allowed window widths are @base_width + @width_inc * N where N is any integer (-1 allowed with #GtkWindow) @@ -1034,6 +1033,15 @@ Deprecated equivalent to gdk_drawable_set_colormap() @hint: + + + + + +@window: +@Returns: + + diff --git a/docs/reference/gdk/tmpl/x_interaction.sgml b/docs/reference/gdk/tmpl/x_interaction.sgml index 2f814abddf..8760a30473 100644 --- a/docs/reference/gdk/tmpl/x_interaction.sgml +++ b/docs/reference/gdk/tmpl/x_interaction.sgml @@ -360,7 +360,7 @@ Obtains the #GdkFont for the given Xlib font ID, or %NULL if no #GdkFont has been created for @xid. -@xid: +@xid: an Xlib font ID