diff options
| author | Cody Russell <bratsche@gnome.org> | 2008-02-07 19:25:07 +0000 |
|---|---|---|
| committer | Cody Russell <bratsche@src.gnome.org> | 2008-02-07 19:25:07 +0000 |
| commit | e97c716a216af558bb71b6cf18d2b2af8d8e0e8d (patch) | |
| tree | 2e2f44f19757c73c1a95de71666a5fa1086b1951 /gdk/win32 | |
| parent | ac6c3719975925a8506ff7f7b36f359fb3a3298b (diff) | |
| download | gtk+-e97c716a216af558bb71b6cf18d2b2af8d8e0e8d.tar.gz | |
gdk/win32/gdkevents-win32.c Fixed two declarations in the middle of a
2008-02-07 Cody Russell <bratsche@gnome.org>
* gdk/win32/gdkevents-win32.c
* gdk/win32/gdkwindow-win32.c: Fixed two declarations in the middle
of a block that were causing compile problems on old
compilers. (#515053, reported by Kazuki IWAMOTO)
svn path=/trunk/; revision=19493
Diffstat (limited to 'gdk/win32')
| -rw-r--r-- | gdk/win32/gdkevents-win32.c | 38 | ||||
| -rw-r--r-- | gdk/win32/gdkwindow-win32.c | 4 |
2 files changed, 24 insertions, 18 deletions
diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c index 0e2be650c7..8aa7c2125d 100644 --- a/gdk/win32/gdkevents-win32.c +++ b/gdk/win32/gdkevents-win32.c @@ -2813,23 +2813,27 @@ gdk_event_translate (MSG *msg, break; case WM_MOUSEACTIVATE: - if (gdk_window_get_window_type (window) == GDK_WINDOW_TEMP - || !((GdkWindowObject *)window)->accept_focus) - { - *ret_valp = MA_NOACTIVATE; - return_val = TRUE; - } - - GdkWindow *tmp = _gdk_modal_current (); - - if (tmp != NULL) - { - if (gdk_window_get_toplevel (window) != tmp) - { - *ret_valp = MA_NOACTIVATEANDEAT; - return_val = TRUE; - } - } + { + GdkWindow *tmp; + + if (gdk_window_get_window_type (window) == GDK_WINDOW_TEMP + || !((GdkWindowObject *)window)->accept_focus) + { + *ret_valp = MA_NOACTIVATE; + return_val = TRUE; + } + + tmp = _gdk_modal_current (); + + if (tmp != NULL) + { + if (gdk_window_get_toplevel (window) != tmp) + { + *ret_valp = MA_NOACTIVATEANDEAT; + return_val = TRUE; + } + } + } break; diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c index 0bcaeba22c..4586edb1ea 100644 --- a/gdk/win32/gdkwindow-win32.c +++ b/gdk/win32/gdkwindow-win32.c @@ -2045,6 +2045,8 @@ _gdk_push_modal_window (GdkWindow *window) void _gdk_remove_modal_window (GdkWindow *window) { + GSList *tmp; + g_return_if_fail (window != NULL); /* It's possible to be NULL here if someone sets the modal hint of the window @@ -2054,7 +2056,7 @@ _gdk_remove_modal_window (GdkWindow *window) /* Find the requested window in the stack and remove it. Yeah, I realize this * means we're not a 'real stack', strictly speaking. Sue me. :) */ - GSList *tmp = g_slist_find (modal_window_stack, window); + tmp = g_slist_find (modal_window_stack, window); if (tmp != NULL) { modal_window_stack = g_slist_delete_link (modal_window_stack, tmp); |