Fix the problem introduced by whoever thought that randomly changing ints

1998-04-14  Miguel de Icaza  <miguel@nuclecu.unam.mx>

	* gdk/gdkwindow.c (gdk_window_xid_at): Fix the problem introduced
	by whoever thought that randomly changing ints to unsigned int
	without reviewing the code was a good idea.  It is, btw not
	mentioned in the ChangeLog as usual, but I know it was not Elliot
	the culprit this time.

diff --git a/ChangeLog b/ChangeLog
index 1cc52e70859e5c791be26d0070c714c581aee6b2..eb9899ccae5bd57ce61825fad6041b985c707c6b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+1998-04-14  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+       * gdk/gdkwindow.c (gdk_window_xid_at): Fix the problem introduced
+       by whoever thought that randomly changing ints to unsigned int
+       without reviewing the code was a good idea.  It is, btw not
+       mentioned in the ChangeLog as usual, but I know it was not Elliot
+       the culprit this time. 
+
 Mon Apr 13 19:16:22 PDT 1998 Shawn T. Amundson <amundson@gtk.org>
 
        * Released GTK+ 1.0.0

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 1cc52e70859e5c791be26d0070c714c581aee6b2..eb9899ccae5bd57ce61825fad6041b985c707c6b 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+1998-04-14  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+       * gdk/gdkwindow.c (gdk_window_xid_at): Fix the problem introduced
+       by whoever thought that randomly changing ints to unsigned int
+       without reviewing the code was a good idea.  It is, btw not
+       mentioned in the ChangeLog as usual, but I know it was not Elliot
+       the culprit this time. 
+
 Mon Apr 13 19:16:22 PDT 1998 Shawn T. Amundson <amundson@gtk.org>
 
        * Released GTK+ 1.0.0

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1cc52e70859e5c791be26d0070c714c581aee6b2..eb9899ccae5bd57ce61825fad6041b985c707c6b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+1998-04-14  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+       * gdk/gdkwindow.c (gdk_window_xid_at): Fix the problem introduced
+       by whoever thought that randomly changing ints to unsigned int
+       without reviewing the code was a good idea.  It is, btw not
+       mentioned in the ChangeLog as usual, but I know it was not Elliot
+       the culprit this time. 
+
 Mon Apr 13 19:16:22 PDT 1998 Shawn T. Amundson <amundson@gtk.org>
 
        * Released GTK+ 1.0.0

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 1cc52e70859e5c791be26d0070c714c581aee6b2..eb9899ccae5bd57ce61825fad6041b985c707c6b 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+1998-04-14  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+       * gdk/gdkwindow.c (gdk_window_xid_at): Fix the problem introduced
+       by whoever thought that randomly changing ints to unsigned int
+       without reviewing the code was a good idea.  It is, btw not
+       mentioned in the ChangeLog as usual, but I know it was not Elliot
+       the culprit this time. 
+
 Mon Apr 13 19:16:22 PDT 1998 Shawn T. Amundson <amundson@gtk.org>
 
        * Released GTK+ 1.0.0

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 1cc52e70859e5c791be26d0070c714c581aee6b2..eb9899ccae5bd57ce61825fad6041b985c707c6b 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+1998-04-14  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+       * gdk/gdkwindow.c (gdk_window_xid_at): Fix the problem introduced
+       by whoever thought that randomly changing ints to unsigned int
+       without reviewing the code was a good idea.  It is, btw not
+       mentioned in the ChangeLog as usual, but I know it was not Elliot
+       the culprit this time. 
+
 Mon Apr 13 19:16:22 PDT 1998 Shawn T. Amundson <amundson@gtk.org>
 
        * Released GTK+ 1.0.0

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 1cc52e70859e5c791be26d0070c714c581aee6b2..eb9899ccae5bd57ce61825fad6041b985c707c6b 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+1998-04-14  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+       * gdk/gdkwindow.c (gdk_window_xid_at): Fix the problem introduced
+       by whoever thought that randomly changing ints to unsigned int
+       without reviewing the code was a good idea.  It is, btw not
+       mentioned in the ChangeLog as usual, but I know it was not Elliot
+       the culprit this time. 
+
 Mon Apr 13 19:16:22 PDT 1998 Shawn T. Amundson <amundson@gtk.org>
 
        * Released GTK+ 1.0.0

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 1cc52e70859e5c791be26d0070c714c581aee6b2..eb9899ccae5bd57ce61825fad6041b985c707c6b 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+1998-04-14  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+       * gdk/gdkwindow.c (gdk_window_xid_at): Fix the problem introduced
+       by whoever thought that randomly changing ints to unsigned int
+       without reviewing the code was a good idea.  It is, btw not
+       mentioned in the ChangeLog as usual, but I know it was not Elliot
+       the culprit this time. 
+
 Mon Apr 13 19:16:22 PDT 1998 Shawn T. Amundson <amundson@gtk.org>
 
        * Released GTK+ 1.0.0

diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 4edb1ead66205400fa26c4488617112e25a5de7c..3dfb9d2a424a3836679f423c23bb7fdf2a236317 100644 (file)
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -65,18 +65,18 @@ gdk_window_xid_at(Window base, gint bx, gint by, gint x, gint y,
    Display *disp;
    Window *list=NULL;
    Window child=0,parent_win=0,root_win=0;
+
    int i;
-   guint num;
+   unsigned int ww, wh, wb, wd, num;
    int wx,wy;
-   guint ww,wh,wb,wd;
-
+   
    window=(GdkWindow*)&gdk_root_parent;
    private=(GdkWindowPrivate*)window;
    disp=private->xdisplay;
    if (!XGetGeometry(disp,base,&root_win,&wx,&wy,&ww,&wh,&wb,&wd))
      return 0;
    wx+=bx;wy+=by;
-   if (!((x>=wx)&&(y>=wy)&&(x<(wx+ww))&&(y<(wy+wh))))
+   if (!((x>=wx)&&(y>=wy)&&(x<(int)(wx+ww))&&(y<(int)(wy+wh))))
      return 0;
    if (!XQueryTree(disp,base,&root_win,&parent_win,&list,&num))
      return base;

diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 4edb1ead66205400fa26c4488617112e25a5de7c..3dfb9d2a424a3836679f423c23bb7fdf2a236317 100644 (file)
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -65,18 +65,18 @@ gdk_window_xid_at(Window base, gint bx, gint by, gint x, gint y,
    Display *disp;
    Window *list=NULL;
    Window child=0,parent_win=0,root_win=0;
+
    int i;
-   guint num;
+   unsigned int ww, wh, wb, wd, num;
    int wx,wy;
-   guint ww,wh,wb,wd;
-
+   
    window=(GdkWindow*)&gdk_root_parent;
    private=(GdkWindowPrivate*)window;
    disp=private->xdisplay;
    if (!XGetGeometry(disp,base,&root_win,&wx,&wy,&ww,&wh,&wb,&wd))
      return 0;
    wx+=bx;wy+=by;
-   if (!((x>=wx)&&(y>=wy)&&(x<(wx+ww))&&(y<(wy+wh))))
+   if (!((x>=wx)&&(y>=wy)&&(x<(int)(wx+ww))&&(y<(int)(wy+wh))))
      return 0;
    if (!XQueryTree(disp,base,&root_win,&parent_win,&list,&num))
      return base;