diff options
| author | Owen Taylor <otaylor@redhat.com> | 2001-11-18 02:15:52 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2001-11-18 02:15:52 +0000 |
| commit | 86dbeabc40d3a25a8552cc446e804c0051be6396 (patch) | |
| tree | 7a3d9ec0851aa6e28554faa74a365b6c6d6d5262 /gdk | |
| parent | 1419815e79d17677677b25dc20e1007d66c923dd (diff) | |
| download | gtk+-86dbeabc40d3a25a8552cc446e804c0051be6396.tar.gz | |
Include glib-object.h instead of gobject/gsignal.h
Sat Nov 17 21:07:46 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkenums.h: Include glib-object.h instead of
gobject/gsignal.h
* gdk/{gdkinternals.h,gdkwindow.c,gdkwindow.[ch],
x11,{fb,win32,x11/gdkwindow-*.c}: Add a dummy GdkScreen
argument to the window_at_pointer() field of
GdkPointerHooks. (Patch from Erwann Chenede)
* gdk/gdkdrawable.h (struct _GdkDrawableClass ): Up
to 6 pointers.
Diffstat (limited to 'gdk')
| -rw-r--r-- | gdk/gdkdrawable.h | 2 | ||||
| -rw-r--r-- | gdk/gdkinternals.h | 3 | ||||
| -rw-r--r-- | gdk/gdkwindow.c | 2 | ||||
| -rw-r--r-- | gdk/gdkwindow.h | 7 | ||||
| -rw-r--r-- | gdk/linux-fb/gdkwindow-fb.c | 5 | ||||
| -rw-r--r-- | gdk/win32/gdkwindow-win32.c | 5 | ||||
| -rw-r--r-- | gdk/x11/gdkwindow-x11.c | 5 |
7 files changed, 20 insertions, 9 deletions
diff --git a/gdk/gdkdrawable.h b/gdk/gdkdrawable.h index edaf700392..9a529c83ab 100644 --- a/gdk/gdkdrawable.h +++ b/gdk/gdkdrawable.h @@ -135,6 +135,8 @@ struct _GdkDrawableClass void (*_gdk_reserved2) (void); void (*_gdk_reserved3) (void); void (*_gdk_reserved4) (void); + void (*_gdk_reserved5) (void); + void (*_gdk_reserved6) (void); }; GType gdk_drawable_get_type (void); diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h index 47f72645de..8a70873f18 100644 --- a/gdk/gdkinternals.h +++ b/gdk/gdkinternals.h @@ -195,7 +195,8 @@ void _gdk_windowing_window_clear_area_e (GdkWindow *window, gint width, gint height); -GdkWindow* _gdk_windowing_window_at_pointer (gint *win_x, +GdkWindow* _gdk_windowing_window_at_pointer (GdkScreen *screen, + gint *win_x, gint *win_y); GdkWindow* _gdk_windowing_window_get_pointer (GdkWindow *window, gint *x, diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c index 06b4951a6b..e166165140 100644 --- a/gdk/gdkwindow.c +++ b/gdk/gdkwindow.c @@ -2637,7 +2637,7 @@ GdkWindow* gdk_window_at_pointer (gint *win_x, gint *win_y) { - return current_pointer_hooks->window_at_pointer (win_x, win_y); + return current_pointer_hooks->window_at_pointer (NULL, win_x, win_y); } /** diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h index bca2b065d3..eae6d9baae 100644 --- a/gdk/gdkwindow.h +++ b/gdk/gdkwindow.h @@ -198,13 +198,18 @@ struct _GdkGeometry GdkGravity win_gravity; }; +/* Dummy typedef for placeholder in GdkPointerHooks.window_at_pointer + */ +typedef struct _GdkScreen GdkScreen; + struct _GdkPointerHooks { GdkWindow* (*get_pointer) (GdkWindow *window, gint *x, gint *y, GdkModifierType *mask); - GdkWindow* (*window_at_pointer) (gint *win_x, + GdkWindow* (*window_at_pointer) (GdkScreen *screen, /* unused for now*/ + gint *win_x, gint *win_y); }; diff --git a/gdk/linux-fb/gdkwindow-fb.c b/gdk/linux-fb/gdkwindow-fb.c index afb22550c0..1755fe4857 100644 --- a/gdk/linux-fb/gdkwindow-fb.c +++ b/gdk/linux-fb/gdkwindow-fb.c @@ -1686,8 +1686,9 @@ _gdk_windowing_window_get_pointer (GdkWindow *window, } GdkWindow* -_gdk_windowing_window_at_pointer (gint *win_x, - gint *win_y) +_gdk_windowing_window_at_pointer (GdkScreen *screen, + gint *win_x, + gint *win_y) { gint rx, ry; GdkWindow *retval = gdk_window_get_pointer (NULL, win_x, win_y, NULL); diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c index 3543501589..68f88958ff 100644 --- a/gdk/win32/gdkwindow-win32.c +++ b/gdk/win32/gdkwindow-win32.c @@ -1882,8 +1882,9 @@ _gdk_windowing_window_get_pointer (GdkWindow *window, } GdkWindow* -_gdk_windowing_window_at_pointer (gint *win_x, - gint *win_y) +_gdk_windowing_window_at_pointer (GdkScreen *screen, + gint *win_x, + gint *win_y) { GdkWindow *window; POINT point, pointc; diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index 49a6636943..ca20fab5d0 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -2397,8 +2397,9 @@ _gdk_windowing_window_get_pointer (GdkWindow *window, } GdkWindow* -_gdk_windowing_window_at_pointer (gint *win_x, - gint *win_y) +_gdk_windowing_window_at_pointer (GdkScreen *screen, + gint *win_x, + gint *win_y) { GdkWindow *window; Window root; |