From be4196dac710ee4aff4ed130b0447c9d7e3e3ad0 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 27 May 2007 01:39:28 +0000 Subject: [PATCH] Remove GdkBitmap 2007-05-26 Matthias Clasen * gdk/gdk-overrides.txt: Remove GdkBitmap * gtk/gtk-sections.txt: * gtk/tmpl/gtkenums.sgml: * gdk/tmpl/rgb.sgml: * gdk/tmpl/gcs.sgml: * gdk/tmpl/pango_interaction.sgml: * gdk/tmpl/windows.sgml: Additions svn path=/trunk/; revision=17945 --- docs/reference/ChangeLog | 10 ++++++ docs/reference/gdk/gdk-overrides.txt | 7 ---- docs/reference/gdk/tmpl/gcs.sgml | 32 +++++++++---------- .../reference/gdk/tmpl/pango_interaction.sgml | 8 +++++ docs/reference/gdk/tmpl/rgb.sgml | 5 +-- docs/reference/gdk/tmpl/windows.sgml | 26 +++++++++++---- docs/reference/gtk/gtk-sections.txt | 1 + docs/reference/gtk/tmpl/gtkenums.sgml | 16 ++++++++++ 8 files changed, 73 insertions(+), 32 deletions(-) diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 1bf9627992..dd47712567 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,13 @@ +2007-05-26 Matthias Clasen + + * gdk/gdk-overrides.txt: Remove GdkBitmap + * gtk/gtk-sections.txt: + * gtk/gtkenums.sgml: + * gdk/rgb.sgml: + * gdk/gcs.sgml: + * gdk/tmpl/pango_interaction.sgml: + * gdk/tmpl/windows.sgml: Additions + 2007-05-26 Matthias Clasen * gdk-pixbuf/gdk-pixbuf-sections.txt: diff --git a/docs/reference/gdk/gdk-overrides.txt b/docs/reference/gdk/gdk-overrides.txt index 4785f77d30..2ca3c1fded 100644 --- a/docs/reference/gdk/gdk-overrides.txt +++ b/docs/reference/gdk/gdk-overrides.txt @@ -15,13 +15,6 @@ struct GdkPixmap }; -GdkBitmap -struct GdkBitmap -{ - gpointer user_data; -}; - - GdkDrawable struct GdkDrawable { diff --git a/docs/reference/gdk/tmpl/gcs.sgml b/docs/reference/gdk/tmpl/gcs.sgml index bb0a504e30..f5a16d35c7 100644 --- a/docs/reference/gdk/tmpl/gcs.sgml +++ b/docs/reference/gdk/tmpl/gcs.sgml @@ -103,22 +103,22 @@ images, only %GDK_COPY, %GDK_XOR and %GDK_INVERT are generally useful. For bitmaps, %GDK_AND and %GDK_OR are also useful. -@GDK_COPY: -@GDK_INVERT: -@GDK_XOR: -@GDK_CLEAR: -@GDK_AND: -@GDK_AND_REVERSE: -@GDK_AND_INVERT: -@GDK_NOOP: -@GDK_OR: -@GDK_EQUIV: -@GDK_OR_REVERSE: -@GDK_COPY_INVERT: -@GDK_OR_INVERT: -@GDK_NAND: -@GDK_NOR: -@GDK_SET: +@GDK_COPY: dst = src +@GDK_INVERT: dst = NOT dst +@GDK_XOR: dst = src XOR dst +@GDK_CLEAR: dst = 0 +@GDK_AND: dst = dst AND src +@GDK_AND_REVERSE: dst = src AND (NOT dst) +@GDK_AND_INVERT: dst = (NOT src) AND dst +@GDK_NOOP: dst = dst +@GDK_OR: dst = src OR dst +@GDK_EQUIV: dst = (NOT src) XOR dst +@GDK_OR_REVERSE: dst = src OR (NOT dst) +@GDK_COPY_INVERT: dst = NOT src +@GDK_OR_INVERT: dst = (NOT src) OR dst +@GDK_NAND: dst = (NOT src) OR (NOT dst) +@GDK_NOR: dst = (NOT src) AND (NOT dst) +@GDK_SET: dst = 1 diff --git a/docs/reference/gdk/tmpl/pango_interaction.sgml b/docs/reference/gdk/tmpl/pango_interaction.sgml index a736659c88..ac61ed9880 100644 --- a/docs/reference/gdk/tmpl/pango_interaction.sgml +++ b/docs/reference/gdk/tmpl/pango_interaction.sgml @@ -240,6 +240,14 @@ rendering the text. @attr: the #PangoAttribute. @embossed: the embossed bitmap. + + +A Pango text attribute specifying the color to emboss text with. + + +@attr: the #PangoAttribute +@color: the color + A Pango text attribute containing a stipple bitmap to be used when diff --git a/docs/reference/gdk/tmpl/rgb.sgml b/docs/reference/gdk/tmpl/rgb.sgml index 1d61fc439e..d61da71768 100644 --- a/docs/reference/gdk/tmpl/rgb.sgml +++ b/docs/reference/gdk/tmpl/rgb.sgml @@ -325,8 +325,9 @@ A private data structure which maps color indices to actual RGB colors. This is used only for gdk_draw_indexed_image(). -@colors: -@n_colors: +@colors: The colors, represented as 0xRRGGBB integer values. +@n_colors: The number of colors in the cmap. + diff --git a/docs/reference/gdk/tmpl/windows.sgml b/docs/reference/gdk/tmpl/windows.sgml index 3dc0b8686d..25687836f1 100644 --- a/docs/reference/gdk/tmpl/windows.sgml +++ b/docs/reference/gdk/tmpl/windows.sgml @@ -202,7 +202,8 @@ window types. @GDK_WINDOW_TYPE_HINT_NORMAL: Normal toplevel window. @GDK_WINDOW_TYPE_HINT_DIALOG: Dialog window. -@GDK_WINDOW_TYPE_HINT_MENU: Window used to implement a menu. +@GDK_WINDOW_TYPE_HINT_MENU: Window used to implement a menu; GTK+ uses + this hint only for torn-off menus, see #GtkTearoffMenuItem. @GDK_WINDOW_TYPE_HINT_TOOLBAR: Window used to implement toolbars. @GDK_WINDOW_TYPE_HINT_SPLASHSCREEN: Window used to display a splash screen during application startup. @@ -211,12 +212,14 @@ window types. @GDK_WINDOW_TYPE_HINT_DOCK: Used for creating dock or panel windows. @GDK_WINDOW_TYPE_HINT_DESKTOP: Used for creating the desktop background window. -@GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU: -@GDK_WINDOW_TYPE_HINT_POPUP_MENU: -@GDK_WINDOW_TYPE_HINT_TOOLTIP: -@GDK_WINDOW_TYPE_HINT_NOTIFICATION: -@GDK_WINDOW_TYPE_HINT_COMBO: -@GDK_WINDOW_TYPE_HINT_DND: +@GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU: A menu that belongs to a menubar. +@GDK_WINDOW_TYPE_HINT_POPUP_MENU: A menu that does not belong to a menubar, + e.g. a context menu. +@GDK_WINDOW_TYPE_HINT_TOOLTIP: A tooltip. +@GDK_WINDOW_TYPE_HINT_NOTIFICATION: A notification - typically a "bubble" + that belongs to a status icon. +@GDK_WINDOW_TYPE_HINT_COMBO: A popup from a combo box. +@GDK_WINDOW_TYPE_HINT_DND: A window that is used to implement a DND cursor. @@ -453,6 +456,15 @@ Deprecated equivalent of g_object_unref() @setting: + + + + + +@window: +@opacity: + + diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt index 77b514e3f1..4cdb79f7a1 100644 --- a/docs/reference/gtk/gtk-sections.txt +++ b/docs/reference/gtk/gtk-sections.txt @@ -5932,6 +5932,7 @@ GtkVisibility GtkWindowPosition GtkWindowType GtkSortType +GtkDragResult GtkMenuCallback diff --git a/docs/reference/gtk/tmpl/gtkenums.sgml b/docs/reference/gtk/tmpl/gtkenums.sgml index 0f6dc9d1b9..b1e551033a 100644 --- a/docs/reference/gtk/tmpl/gtkenums.sgml +++ b/docs/reference/gtk/tmpl/gtkenums.sgml @@ -480,3 +480,19 @@ Determines the direction of a sort. @GTK_SORT_ASCENDING: Sorting is in ascending order. @GTK_SORT_DESCENDING: Sorting is in descending order. + + +Gives an indication why a drag operation failed. +The value can by obtained by connecting to the +#GtkWidget::drag-failed signal. + + +@GTK_DRAG_RESULT_SUCCESS: The drag operation was successful +@GTK_DRAG_RESULT_NO_TARGET: No suitable drag target +@GTK_DRAG_RESULT_USER_CANCELLED: The user cancelled the drag operation +@GTK_DRAG_RESULT_TIMEOUT_EXPIRED: The drag operation timed out +@GTK_DRAG_RESULT_GRAB_BROKEN: The pointer or keyboard grab used + for the drag operation was broken +@GTK_DRAG_RESULT_ERROR: The drag operation failed due to some + unspecified error +