diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-10-07 19:42:49 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-10-07 19:42:49 +0000 |
| commit | 253458ec525ac1d1ed45ce47a79365df7905e01f (patch) | |
| tree | 3712ec56f7242c2d56b4c8dfbdb03e9aff4ff8df /gtk/gtkwidget.c | |
| parent | 55704fc7c1b5429bf8cc7e8100893b01898a9fe8 (diff) | |
| download | gtk+-253458ec525ac1d1ed45ce47a79365df7905e01f.tar.gz | |
- Replace GdkPointerHooks with a multihead-safe GdkDisplayPointerHooks,
Mon Oct 7 15:10:00 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdkdisplay.[ch] gdk/gdkinternals.h
gdk/gdkwindow.[ch] gdk/linux-fb/gdkwindow-fb.c
gdk/win32/gdkwindow-win32.c gdk/x11/gdkwindow-x11.c:
- Replace GdkPointerHooks with a multihead-safe
GdkDisplayPointerHooks, leave GdkPointerHooks
around for singlehead.
- Add gdk_display_get_pointer() to get the pointer
location with the screen it is on.
* gdk/gdk.def gdk/gdkdisplay.[ch] gdk/gdkscreen.[ch]:
Change gdk_screen_get_window_at_pointer() to
gdk_display_get_window_at_pointer().
* gtk/gtktreeview.c demos/gtk-demo/changedisplay.c
tests/testgtk.c: Use gdk_display_get_window_at_pointer(),
not gdk_screen_get_window_at_pointer().
* gtk/gtkcolorsel.c: Fix grabbing color to be multihead
safe.
* gtk/gtkwidget.c: Allow gtk_widget_push_colormap (NULL).
since it is useful for writing code that doesn't
know the dcurrent state but needs a clean colormap.
* gtk/gtkrc.c: When loading the settings for a particular
screen, only reset toplevels on that screen.
* gtk/gtkiconfactory.h: Fix #ifdef GTK_MULTIHEAD_SAFE
that should have been #ifndef GTK_MULTIHEAD_SAFE.
Diffstat (limited to 'gtk/gtkwidget.c')
| -rw-r--r-- | gtk/gtkwidget.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index c6b40d70cf..418ee4d326 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -5554,7 +5554,7 @@ gtk_widget_pop_composite_child (void) void gtk_widget_push_colormap (GdkColormap *cmap) { - g_return_if_fail (GDK_IS_COLORMAP (cmap)); + g_return_if_fail (!cmap || GDK_IS_COLORMAP (cmap)); colormap_stack = g_slist_prepend (colormap_stack, cmap); } |