callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

applied patch to fix draw_indicator behaviour from Lars Hamann and Stefan

Browse Source 
Tue Feb 17 05:41:31 1998  Tim Janik  <timj@gimp.org>

        * gtk/gtkcheckbutton.c:
        * gtk/gtkradiobutton.c:
        * gtk/gtktogglebutton.c:
          applied patch to fix draw_indicator behaviour from Lars Hamann
          and Stefan Jeske.

        * gtk/gtkmain.h:
        * gtk/gtkmain.c (gtk_grab_get_current): new function
          that returns the current grab widget or NULL.

        * gdk/gdkwindow.c (gdk_window_shape_combine_mask): remove
          shape mask if mask==NULL (provided by Stefan Wille).
This commit is contained in:
Tim Janik
1998-02-17 06:03:40 +00:00
committed by Tim Janik
parent 9f96d18eb1
commit a303493882
15 changed files with 208 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1255,21 +1255,33 @@ gdk_window_shape_combine_mask (GdkWindow *window,
gint x, gint y)
{
GdkWindowPrivate *window_private;
GdkWindowPrivate *pixmap_private;
Pixmap pixmap;
g_return_if_fail (window != NULL);
g_return_if_fail (mask != NULL);
window_private = (GdkWindowPrivate*) window;
pixmap_private = (GdkWindowPrivate*) mask;
if (window_private->destroyed)
return;
if (mask)
{
GdkWindowPrivate *pixmap_private;
pixmap_private = (GdkWindowPrivate*) mask;
pixmap = (Pixmap) pixmap_private->xwindow;
}
else
{
x = 0;
y = 0;
pixmap = None;
}
XShapeCombineMask (window_private->xdisplay,
window_private->xwindow,
ShapeBounding,
x, y, /* offset */
(Pixmap)pixmap_private->xwindow,
x, y,
pixmap,
ShapeSet);
}