diff options
| author | Miguel de Icaza <miguel@nuclecu.unam.mx> | 1998-04-15 02:15:36 +0000 |
|---|---|---|
| committer | Arturo Espinosa <unammx@src.gnome.org> | 1998-04-15 02:15:36 +0000 |
| commit | 21bb83612d6785164aa5e1b0f1e38a2c29a708ca (patch) | |
| tree | 12c5ae72f7b5a5eeef11b9db7a16206f718e0c3a /gdk | |
| parent | efd3aec5037f190d2b7d161790688eb352609f40 (diff) | |
| download | gdk-pixbuf-21bb83612d6785164aa5e1b0f1e38a2c29a708ca.tar.gz | |
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.
Diffstat (limited to 'gdk')
| -rw-r--r-- | gdk/gdkwindow.c | 8 | ||||
| -rw-r--r-- | gdk/x11/gdkwindow-x11.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c index 4edb1ead6..3dfb9d2a4 100644 --- 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 4edb1ead6..3dfb9d2a4 100644 --- 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; |