AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-05 16:20:10 +00:00
Code Issues Projects Releases Wiki Activity

Include glib-object.h instead of gobject/gsignal.h

Browse Source 
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.
This commit is contained in:
Owen Taylor 2001-11-18 02:15:52 +00:00 committed by Owen Taylor
parent 1419815e79
commit 86dbeabc40
15 changed files with 116 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,16 @@
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

13
ChangeLog.pre-2-0
View File

@ -1,3 +1,16 @@
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

13
ChangeLog.pre-2-10
View File

@ -1,3 +1,16 @@
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

13
ChangeLog.pre-2-2
View File

@ -1,3 +1,16 @@
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

13
ChangeLog.pre-2-4
View File

@ -1,3 +1,16 @@
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

13
ChangeLog.pre-2-6
View File

@ -1,3 +1,16 @@
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

13
ChangeLog.pre-2-8
View File

@ -1,3 +1,16 @@
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

2
gdk/gdkdrawable.h
View File

@ -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);

3
gdk/gdkinternals.h
View File

@ -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,

2
gdk/gdkwindow.c
View File

@ -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);
}
/**

7
gdk/gdkwindow.h
View File

@ -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);
};

5
gdk/linux-fb/gdkwindow-fb.c
View File

@ -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);

5
gdk/win32/gdkwindow-win32.c
View File

@ -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;

5
gdk/x11/gdkwindow-x11.c
View File

@ -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;

10
tests/testgtk.c
View File

@ -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;