Fix bug where the background pixmap was being offset twice, once by the

Mon Sep  1 19:39:14 2003  Soeren Sandmann  <sandmann@daimi.au.dk>

	* gdk/gdkwindow.c (gdk_window_get_bg_gc): Fix bug where the
	background pixmap was being offset twice, once by the ts_origin in
	gdk_window_get_bg_gc(), and once by gdk_draw_rectangle().

diff --git a/ChangeLog b/ChangeLog
index 4fb5db4b7c204e688331be3ab299b65b64d9db96..7e4ab318ba452f4287fbb204a5dabe504849bdbe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Sep  1 19:39:14 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gdk/gdkwindow.c (gdk_window_get_bg_gc): Fix bug where the
+       background pixmap was being offset twice, once by the ts_origin in
+       gdk_window_get_bg_gc(), and once by gdk_draw_rectangle().
+
 2003-09-01  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkuimanager.[ch] (gtk_ui_manager_ensure_update): Make

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4fb5db4b7c204e688331be3ab299b65b64d9db96..7e4ab318ba452f4287fbb204a5dabe504849bdbe 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Mon Sep  1 19:39:14 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gdk/gdkwindow.c (gdk_window_get_bg_gc): Fix bug where the
+       background pixmap was being offset twice, once by the ts_origin in
+       gdk_window_get_bg_gc(), and once by gdk_draw_rectangle().
+
 2003-09-01  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkuimanager.[ch] (gtk_ui_manager_ensure_update): Make

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 4fb5db4b7c204e688331be3ab299b65b64d9db96..7e4ab318ba452f4287fbb204a5dabe504849bdbe 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Mon Sep  1 19:39:14 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gdk/gdkwindow.c (gdk_window_get_bg_gc): Fix bug where the
+       background pixmap was being offset twice, once by the ts_origin in
+       gdk_window_get_bg_gc(), and once by gdk_draw_rectangle().
+
 2003-09-01  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkuimanager.[ch] (gtk_ui_manager_ensure_update): Make

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 4fb5db4b7c204e688331be3ab299b65b64d9db96..7e4ab318ba452f4287fbb204a5dabe504849bdbe 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Mon Sep  1 19:39:14 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gdk/gdkwindow.c (gdk_window_get_bg_gc): Fix bug where the
+       background pixmap was being offset twice, once by the ts_origin in
+       gdk_window_get_bg_gc(), and once by gdk_draw_rectangle().
+
 2003-09-01  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkuimanager.[ch] (gtk_ui_manager_ensure_update): Make

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 4fb5db4b7c204e688331be3ab299b65b64d9db96..7e4ab318ba452f4287fbb204a5dabe504849bdbe 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Mon Sep  1 19:39:14 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gdk/gdkwindow.c (gdk_window_get_bg_gc): Fix bug where the
+       background pixmap was being offset twice, once by the ts_origin in
+       gdk_window_get_bg_gc(), and once by gdk_draw_rectangle().
+
 2003-09-01  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkuimanager.[ch] (gtk_ui_manager_ensure_update): Make

diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 3c355118e9fc55252d30c6f75bc9c24d8bed7a03..5ad7cd1df8c46f110584ad514805463124df0def 100644 (file)
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -874,11 +874,8 @@ gdk_window_get_bg_gc (GdkWindow      *window,
     {
       gc_values.fill = GDK_TILED;
       gc_values.tile = private->bg_pixmap;
-      gc_values.ts_x_origin = - paint->x_offset;
-      gc_values.ts_y_origin = - paint->y_offset;
       
-      gc_mask = (GDK_GC_FILL | GDK_GC_TILE | 
-                 GDK_GC_TS_X_ORIGIN | GDK_GC_TS_Y_ORIGIN);
+      gc_mask = GDK_GC_FILL | GDK_GC_TILE;
     }
   else
     {