Commit 20d60baf authored by Jason Rumney's avatar Jason Rumney
Browse files

(w32_wnd_proc): Don't check context before initializing.

parent 4b9c0a49
2010-08-19 Jason Rumney <jasonr@gnu.org>
* w32fns.c (w32_wnd_proc): Don't check context before initializing.
2010-08-19 Jan Djärv <jan.h.d@swipnet.se> 2010-08-19 Jan Djärv <jan.h.d@swipnet.se>
   
* nsselect.m (nxatoms_of_nsselect): Use "Selection" and "Secondary". * nsselect.m (nxatoms_of_nsselect): Use "Selection" and "Secondary".
......
...@@ -3109,9 +3109,6 @@ w32_wnd_proc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) ...@@ -3109,9 +3109,6 @@ w32_wnd_proc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
HIMC context; HIMC context;
struct window *w; struct window *w;
if (!context)
break;
f = x_window_to_frame (dpyinfo, hwnd); f = x_window_to_frame (dpyinfo, hwnd);
w = XWINDOW (FRAME_SELECTED_WINDOW (f)); w = XWINDOW (FRAME_SELECTED_WINDOW (f));
...@@ -3129,6 +3126,10 @@ w32_wnd_proc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) ...@@ -3129,6 +3126,10 @@ w32_wnd_proc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
- WINDOW_MODE_LINE_HEIGHT (w)); - WINDOW_MODE_LINE_HEIGHT (w));
context = get_ime_context_fn (hwnd); context = get_ime_context_fn (hwnd);
if (!context)
break;
set_ime_composition_window_fn (context, &form); set_ime_composition_window_fn (context, &form);
release_ime_context_fn (hwnd, context); release_ime_context_fn (hwnd, context);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment