comparison src/w32fns.c @ 111036:db77dacc48e1

merge emacs-23
author Kenichi Handa <handa@m17n.org>
date Fri, 15 Oct 2010 09:43:23 +0900
parents 734b2470f93c
children b8fde5ef9e14 538894189022
comparison
equal deleted inserted replaced
111035:31d92d74a71a 111036:db77dacc48e1
243 RECT rcWork; 243 RECT rcWork;
244 DWORD dwFlags; 244 DWORD dwFlags;
245 }; 245 };
246 246
247 /* Reportedly, VS 6 does not have this in its headers. */ 247 /* Reportedly, VS 6 does not have this in its headers. */
248 #if defined(_MSC_VER) && _MSC_VER < 1300 248 #if defined (_MSC_VER) && _MSC_VER < 1300
249 DECLARE_HANDLE(HMONITOR); 249 DECLARE_HANDLE(HMONITOR);
250 #endif 250 #endif
251 251
252 typedef BOOL (WINAPI * TrackMouseEvent_Proc) 252 typedef BOOL (WINAPI * TrackMouseEvent_Proc)
253 (IN OUT LPTRACKMOUSEEVENT lpEventTrack); 253 (IN OUT LPTRACKMOUSEEVENT lpEventTrack);
1939 SetWindowText (FRAME_W32_WINDOW (f), SDATA (name)); 1939 SetWindowText (FRAME_W32_WINDOW (f), SDATA (name));
1940 UNBLOCK_INPUT; 1940 UNBLOCK_INPUT;
1941 } 1941 }
1942 } 1942 }
1943 1943
1944
1945 void x_set_scroll_bar_default_width (f) 1944 void x_set_scroll_bar_default_width (f)
1946 struct frame *f; 1945 struct frame *f;
1947 { 1946 {
1948 int wid = FRAME_COLUMN_WIDTH (f); 1947 int wid = FRAME_COLUMN_WIDTH (f);
1949 1948
3167 W32Msg wmsg; 3166 W32Msg wmsg;
3168 HIMC context = get_ime_context_fn (hwnd); 3167 HIMC context = get_ime_context_fn (hwnd);
3169 wmsg.dwModifiers = w32_get_key_modifiers (wParam, lParam); 3168 wmsg.dwModifiers = w32_get_key_modifiers (wParam, lParam);
3170 /* Get buffer size. */ 3169 /* Get buffer size. */
3171 size = get_composition_string_fn (context, GCS_RESULTSTR, buffer, 0); 3170 size = get_composition_string_fn (context, GCS_RESULTSTR, buffer, 0);
3172 buffer = alloca(size); 3171 buffer = alloca (size);
3173 size = get_composition_string_fn (context, GCS_RESULTSTR, 3172 size = get_composition_string_fn (context, GCS_RESULTSTR,
3174 buffer, size); 3173 buffer, size);
3175 release_ime_context_fn (hwnd, context); 3174 release_ime_context_fn (hwnd, context);
3176 3175
3177 signal_user_input (); 3176 signal_user_input ();
4005 4004
4006 dflt: 4005 dflt:
4007 return DefWindowProc (hwnd, msg, wParam, lParam); 4006 return DefWindowProc (hwnd, msg, wParam, lParam);
4008 } 4007 }
4009 4008
4010
4011 /* The most common default return code for handled messages is 0. */ 4009 /* The most common default return code for handled messages is 0. */
4012 return 0; 4010 return 0;
4013 } 4011 }
4014 4012
4015 static void 4013 static void
4457 "lineSpacing", "LineSpacing", RES_TYPE_NUMBER); 4455 "lineSpacing", "LineSpacing", RES_TYPE_NUMBER);
4458 x_default_parameter (f, parameters, Qleft_fringe, Qnil, 4456 x_default_parameter (f, parameters, Qleft_fringe, Qnil,
4459 "leftFringe", "LeftFringe", RES_TYPE_NUMBER); 4457 "leftFringe", "LeftFringe", RES_TYPE_NUMBER);
4460 x_default_parameter (f, parameters, Qright_fringe, Qnil, 4458 x_default_parameter (f, parameters, Qright_fringe, Qnil,
4461 "rightFringe", "RightFringe", RES_TYPE_NUMBER); 4459 "rightFringe", "RightFringe", RES_TYPE_NUMBER);
4462
4463 4460
4464 /* Init faces before x_default_parameter is called for scroll-bar 4461 /* Init faces before x_default_parameter is called for scroll-bar
4465 parameters because that function calls x_set_scroll_bar_width, 4462 parameters because that function calls x_set_scroll_bar_width,
4466 which calls change_frame_size, which calls Fset_window_buffer, 4463 which calls change_frame_size, which calls Fset_window_buffer,
4467 which runs hooks, which call Fvertical_motion. At the end, we 4464 which runs hooks, which call Fvertical_motion. At the end, we