Commit 86dbeabc authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

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.
parent 1419815e
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.
2001-11-17 Matt Wilson <msw@redhat.com>
* gtk/gtkenums.h: must include glib-object.h only
......
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.
2001-11-17 Matt Wilson <msw@redhat.com>
* gtk/gtkenums.h: must include glib-object.h only
......
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.
2001-11-17 Matt Wilson <msw@redhat.com>
* gtk/gtkenums.h: must include glib-object.h only
......
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.
2001-11-17 Matt Wilson <msw@redhat.com>
* gtk/gtkenums.h: must include glib-object.h only
......
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.
2001-11-17 Matt Wilson <msw@redhat.com>
* gtk/gtkenums.h: must include glib-object.h only
......
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.
2001-11-17 Matt Wilson <msw@redhat.com>
* gtk/gtkenums.h: must include glib-object.h only
......
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.
2001-11-17 Matt Wilson <msw@redhat.com>
* gtk/gtkenums.h: must include glib-object.h only
......
......@@ -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);
......
......@@ -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,
......
......@@ -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);
}
/**
......
......@@ -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);
};
......
......@@ -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);
......
......@@ -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;
......
......@@ -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;
......
......@@ -10685,11 +10685,11 @@ layout_expose_handler (GtkWidget *widget, GdkEventExpose *event)
layout = GTK_LAYOUT (widget);
imin = (layout->xoffset + event->area.x) / 10;
imax = (layout->xoffset + event->area.x + event->area.width + 9) / 10;
imin = (event->area.x) / 10;
imax = (event->area.x + event->area.width + 9) / 10;
jmin = (layout->yoffset + event->area.y) / 10;
jmax = (layout->yoffset + event->area.y + event->area.height + 9) / 10;
jmin = (event->area.y) / 10;
jmax = (event->area.y + event->area.height + 9) / 10;
gdk_window_clear_area (widget->window,
event->area.x, event->area.y,
......@@ -10701,7 +10701,7 @@ layout_expose_handler (GtkWidget *widget, GdkEventExpose *event)
gdk_draw_rectangle (layout->bin_window,
widget->style->black_gc,
TRUE,
10*i - layout->xoffset, 10*j - layout->yoffset,
10*i, 10*j,
1+i%10, 1+j%10);
return TRUE;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment