summaryrefslogtreecommitdiff
path: root/gdk
diff options
context:
space:
mode:
authorJay Painter <jpaint@src.gnome.org>1998-02-18 10:03:54 +0000
committerJay Painter <jpaint@src.gnome.org>1998-02-18 10:03:54 +0000
commit9ad922290cc7495298099a4b97029942b0ce34c3 (patch)
treeea2a61952c1a77e20a90ee41628b9a877e41ff9e /gdk
parent7e3692b99f0b1e251ca4264b318b6e5c0462242a (diff)
downloadgdk-pixbuf-9ad922290cc7495298099a4b97029942b0ce34c3.tar.gz
A couple of compiler warning fixes, GtkCList signal changes, changed
fileselect to work with new CList signals, and enhanced testgtk's clist example to show pixmaps and signal results. -Jay Painter
Diffstat (limited to 'gdk')
-rw-r--r--gdk/gdk.c28
-rw-r--r--gdk/x11/gdkmain-x11.c28
2 files changed, 30 insertions, 26 deletions
diff --git a/gdk/gdk.c b/gdk/gdk.c
index b7ecdcf7a..b11b3f823 100644
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -1282,21 +1282,23 @@ gdk_pointer_grab (GdkWindow * window,
confine_to,
time);
else
- return_val = Success;;
+ return_val = Success;
if (return_val == Success)
- if (!window_private->destroyed)
- return_val = XGrabPointer (window_private->xdisplay,
- xwindow,
- owner_events,
- xevent_mask,
- GrabModeAsync, GrabModeAsync,
- xconfine_to,
- xcursor,
- time);
- else
- return_val = AlreadyGrabbed;
-
+ {
+ if (!window_private->destroyed)
+ return_val = XGrabPointer (window_private->xdisplay,
+ xwindow,
+ owner_events,
+ xevent_mask,
+ GrabModeAsync, GrabModeAsync,
+ xconfine_to,
+ xcursor,
+ time);
+ else
+ return_val = AlreadyGrabbed;
+ }
+
if (return_val == GrabSuccess)
xgrab_window = window_private;
diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index b7ecdcf7a..b11b3f823 100644
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -1282,21 +1282,23 @@ gdk_pointer_grab (GdkWindow * window,
confine_to,
time);
else
- return_val = Success;;
+ return_val = Success;
if (return_val == Success)
- if (!window_private->destroyed)
- return_val = XGrabPointer (window_private->xdisplay,
- xwindow,
- owner_events,
- xevent_mask,
- GrabModeAsync, GrabModeAsync,
- xconfine_to,
- xcursor,
- time);
- else
- return_val = AlreadyGrabbed;
-
+ {
+ if (!window_private->destroyed)
+ return_val = XGrabPointer (window_private->xdisplay,
+ xwindow,
+ owner_events,
+ xevent_mask,
+ GrabModeAsync, GrabModeAsync,
+ xconfine_to,
+ xcursor,
+ time);
+ else
+ return_val = AlreadyGrabbed;
+ }
+
if (return_val == GrabSuccess)
xgrab_window = window_private;