[gtk+/gtk-2-22] Remove window background getters again
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-2-22] Remove window background getters again
- Date: Sun, 15 Aug 2010 01:33:37 +0000 (UTC)
commit 370dfc16cacd91807c6ee2492e8efec68d7676ff
Author: Benjamin Otte <otte redhat com>
Date: Sun Aug 15 03:31:37 2010 +0200
Remove window background getters again
They were added as accessors for 2.22 even though querying the
background wasn't possible previously. As GTK 3.0 will change background
handling, it doesn't make sense at all to expose these getters.
gdk/gdk.symbols | 2 -
gdk/gdkwindow.c | 60 -------------------------------------------------------
gdk/gdkwindow.h | 5 ----
3 files changed, 0 insertions(+), 67 deletions(-)
---
diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols
index 28065a3..7d3bbf3 100644
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@ -676,8 +676,6 @@ gdk_window_move_resize
gdk_window_scroll
gdk_window_move_region
gdk_window_get_accept_focus
-gdk_window_get_back_pixmap
-gdk_window_get_background
gdk_window_get_composited
gdk_window_get_cursor
gdk_window_get_deskrelative_origin
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 036f8c2..a8d3bbb 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -7828,29 +7828,6 @@ gdk_window_move_region (GdkWindow *window,
}
/**
- * gdk_window_get_background:
- * @window: a #GdkWindow.
- * @color: (out): a #GdkColor to be filled in
- *
- * Sets @color to equal the current background color of @window.
- *
- * Since: 2.22
- */
-void
-gdk_window_get_background (GdkWindow *window,
- GdkColor *color)
-{
- GdkWindowObject *private;
-
- g_return_if_fail (GDK_IS_WINDOW (window));
- g_return_if_fail (color != NULL);
-
- private = (GdkWindowObject *) window;
-
- *color = private->bg_color;
-}
-
-/**
* gdk_window_set_background:
* @window: a #GdkWindow
* @color: an allocated #GdkColor
@@ -7897,43 +7874,6 @@ gdk_window_set_background (GdkWindow *window,
}
/**
- * gdk_window_get_back_pixmap:
- * @window: a #GdkWindow.
- * @pixmap: (out) (allow-none): a #GdkPixmap to be filled in, or %NULL.
- * @parent_relative: (out) (allow-none): a pointer to a #gboolean to be filled in, or %NULL.
- *
- * Sets @pixmap to the current background pixmap of @window. You do not
- * own the pointer that is returned and this pointer should not be freeed
- * or unreferenced. Sets @parent_relative to %TRUE if the tiling is done
- * based on the origin of the parent window.
- *
- * Since: 2.22
- */
-void
-gdk_window_get_back_pixmap (GdkWindow *window,
- GdkPixmap **pixmap,
- gboolean *parent_relative)
-{
- GdkWindowObject *private;
-
- g_return_if_fail (GDK_IS_WINDOW (window));
-
- private = (GdkWindowObject *) window;
-
- if (pixmap)
- {
- if (private->bg_pixmap == GDK_PARENT_RELATIVE_BG ||
- private->bg_pixmap == GDK_NO_BG)
- *pixmap = NULL;
- else
- *pixmap = private->bg_pixmap;
- }
-
- if (parent_relative)
- *parent_relative = (private->bg_pixmap == GDK_PARENT_RELATIVE_BG);
-}
-
-/**
* gdk_window_set_back_pixmap:
* @window: a #GdkWindow
* @pixmap: (allow-none): a #GdkPixmap, or %NULL
diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h
index 70dd1d2..af72732 100644
--- a/gdk/gdkwindow.h
+++ b/gdk/gdkwindow.h
@@ -526,13 +526,8 @@ void gdk_window_set_startup_id (GdkWindow *window,
const gchar *startup_id);
void gdk_window_set_transient_for (GdkWindow *window,
GdkWindow *parent);
-void gdk_window_get_background (GdkWindow *window,
- GdkColor *color);
void gdk_window_set_background (GdkWindow *window,
const GdkColor *color);
-void gdk_window_get_back_pixmap (GdkWindow *window,
- GdkPixmap **pixmap,
- gboolean *parent_relative);
void gdk_window_set_back_pixmap (GdkWindow *window,
GdkPixmap *pixmap,
gboolean parent_relative);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]