diff options
| -rw-r--r-- | docs/reference/gdk/tmpl/windows.sgml | 8 | ||||
| -rw-r--r-- | docs/reference/gtk/Makefile.am | 1 | ||||
| -rw-r--r-- | docs/reference/gtk/gtk-sections.txt | 5 | ||||
| -rw-r--r-- | docs/reference/gtk/migrating-ClientSideWindows.sgml | 2 | ||||
| -rw-r--r-- | docs/reference/gtk/tmpl/gtkrange.sgml | 18 | ||||
| -rw-r--r-- | docs/reference/gtk/tmpl/gtkwidget.sgml | 27 | ||||
| -rw-r--r-- | gdk/gdkoffscreenwindow.c | 2 |
7 files changed, 61 insertions, 2 deletions
diff --git a/docs/reference/gdk/tmpl/windows.sgml b/docs/reference/gdk/tmpl/windows.sgml index 82cf5eb26c..a1c9633aa8 100644 --- a/docs/reference/gdk/tmpl/windows.sgml +++ b/docs/reference/gdk/tmpl/windows.sgml @@ -194,6 +194,12 @@ select an offscreen child at given coordinates, and the #GdkWindow::to-embedder and #GdkWindow::from-embedder signals on the offscreen window are used to translate coordinates between the embedder and the offscreen window. </para> + +<para> +For rendering an offscreen window onto its embedder, the contents of the +offscreen window are available as a pixmap, via +gdk_offscreen_window_get_pixmap(). +</para> </refsect2> <!-- ##### SECTION See_Also ##### --> @@ -262,7 +268,7 @@ Describes the kind of window. @GDK_WINDOW_DIALOG: useless/deprecated compatibility type @GDK_WINDOW_TEMP: override redirect temporary window (used to implement #GtkMenu) @GDK_WINDOW_FOREIGN: foreign window (see gdk_window_foreign_new()) -@GDK_WINDOW_OFFSCREEN: offscreen window. Since 2.18 +@GDK_WINDOW_OFFSCREEN: offscreen window (see <xref linkend="OFFSCREEN-WINDOWS"/>). Since 2.18 <!-- ##### ENUM GdkWindowClass ##### --> <para> diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am index 21eed24043..6a0b30acdb 100644 --- a/docs/reference/gtk/Makefile.am +++ b/docs/reference/gtk/Makefile.am @@ -160,6 +160,7 @@ expand_content_files = \ drawing-model.xml \ glossary.xml \ migrating-checklist.sgml \ + migrating-ClientSideWindows.sgml \ migrating-GtkAction.sgml \ migrating-GtkComboBox.sgml \ migrating-GtkEntry-icons.sgml \ diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt index f4bcff1115..5b3eb7e121 100644 --- a/docs/reference/gtk/gtk-sections.txt +++ b/docs/reference/gtk/gtk-sections.txt @@ -3074,6 +3074,8 @@ gtk_range_set_lower_stepper_sensitivity gtk_range_get_lower_stepper_sensitivity gtk_range_set_upper_stepper_sensitivity gtk_range_get_upper_stepper_sensitivity +gtk_range_get_flippable +gtk_range_set_flippable <SUBSECTION Standard> GTK_RANGE GTK_IS_RANGE @@ -5595,6 +5597,9 @@ gtk_widget_set_visible gtk_widget_has_default gtk_widget_has_focus gtk_widget_has_grab +gtk_widget_is_drawable +gtk_widget_is_toplevel +gtk_widget_set_window <SUBSECTION> gtk_requisition_copy diff --git a/docs/reference/gtk/migrating-ClientSideWindows.sgml b/docs/reference/gtk/migrating-ClientSideWindows.sgml index 96372f79af..5eecd19a61 100644 --- a/docs/reference/gtk/migrating-ClientSideWindows.sgml +++ b/docs/reference/gtk/migrating-ClientSideWindows.sgml @@ -19,7 +19,7 @@ </para> <para> - GDK looks for the <envvar>GDK_NATIVE_WINDOWS</envvar> environment variable + GDK looks for the <envar>GDK_NATIVE_WINDOWS</envar> environment variable and makes all windows native if it is set. It also tries to be more compatible with the way prior versions worked in some other ways. </para> diff --git a/docs/reference/gtk/tmpl/gtkrange.sgml b/docs/reference/gtk/tmpl/gtkrange.sgml index a9c92f75da..3f24667239 100644 --- a/docs/reference/gtk/tmpl/gtkrange.sgml +++ b/docs/reference/gtk/tmpl/gtkrange.sgml @@ -346,3 +346,21 @@ at the end of range widgets. @Returns: +<!-- ##### FUNCTION gtk_range_get_flippable ##### --> +<para> + +</para> + +@range: +@Returns: + + +<!-- ##### FUNCTION gtk_range_set_flippable ##### --> +<para> + +</para> + +@range: +@flippable: + + diff --git a/docs/reference/gtk/tmpl/gtkwidget.sgml b/docs/reference/gtk/tmpl/gtkwidget.sgml index 4bc0c10ffd..bdeabd7db5 100644 --- a/docs/reference/gtk/tmpl/gtkwidget.sgml +++ b/docs/reference/gtk/tmpl/gtkwidget.sgml @@ -2803,6 +2803,33 @@ This function is deprecated; it does nothing. @Returns: +<!-- ##### FUNCTION gtk_widget_is_drawable ##### --> +<para> + +</para> + +@widget: +@Returns: + + +<!-- ##### FUNCTION gtk_widget_is_toplevel ##### --> +<para> + +</para> + +@widget: +@Returns: + + +<!-- ##### FUNCTION gtk_widget_set_window ##### --> +<para> + +</para> + +@widget: +@window: + + <!-- ##### FUNCTION gtk_requisition_copy ##### --> <para> diff --git a/gdk/gdkoffscreenwindow.c b/gdk/gdkoffscreenwindow.c index 9a3942c6a3..202e798b4f 100644 --- a/gdk/gdkoffscreenwindow.c +++ b/gdk/gdkoffscreenwindow.c @@ -837,6 +837,8 @@ gdk_offscreen_window_get_pointer (GdkWindow *window, * add a reference to it. * * Returns: The offscreen pixmap, or %NULL if not offscreen + * + * Since: 2.18 */ GdkPixmap * gdk_offscreen_window_get_pixmap (GdkWindow *window) |