comparison src/glyphs-msw.c @ 5920:0f2338afbabf cygwin

Minimum necessary to get started: sufficient to compile OK, run -nw, but not with window
author Henry Thompson <ht@markup.co.uk>
date Mon, 21 Apr 2014 11:42:50 +0100
parents 56144c8593a8
children 68639fb08af8
comparison
equal deleted inserted replaced
5919:2800105fcc9f 5920:0f2338afbabf
2131 IMAGE_INSTANCE_WIDGET_WIDTH (ii), 2131 IMAGE_INSTANCE_WIDGET_WIDTH (ii),
2132 IMAGE_INSTANCE_WIDGET_HEIGHT (ii), 2132 IMAGE_INSTANCE_WIDGET_HEIGHT (ii),
2133 IMAGE_INSTANCE_MSWINDOWS_CLIPWINDOW (ii), 2133 IMAGE_INSTANCE_MSWINDOWS_CLIPWINDOW (ii),
2134 0, 2134 0,
2135 (HINSTANCE) 2135 (HINSTANCE)
2136 qxeGetWindowLong 2136 qxeGetWindowLongPtr
2137 (FRAME_MSWINDOWS_HANDLE (XFRAME (frame)), 2137 (FRAME_MSWINDOWS_HANDLE (XFRAME (frame)),
2138 GWL_HINSTANCE), 2138 GWLP_HINSTANCE),
2139 NULL); 2139 NULL);
2140 2140
2141 qxeSetWindowLong (wnd, GWL_USERDATA, (LONG)STORE_LISP_IN_VOID(image_instance)); 2141 qxeSetWindowLongPtr (wnd, GWLP_USERDATA, (LONG_PTR)STORE_LISP_IN_VOID(image_instance));
2142 IMAGE_INSTANCE_SUBWINDOW_ID (ii) = wnd; 2142 IMAGE_INSTANCE_SUBWINDOW_ID (ii) = wnd;
2143 } 2143 }
2144 2144
2145 #endif /* HAVE_WIDGETS */ 2145 #endif /* HAVE_WIDGETS */
2146 2146
2276 IMAGE_INSTANCE_WIDGET_HEIGHT (ii), 2276 IMAGE_INSTANCE_WIDGET_HEIGHT (ii),
2277 /* parent window */ 2277 /* parent window */
2278 IMAGE_INSTANCE_MSWINDOWS_CLIPWINDOW (ii), 2278 IMAGE_INSTANCE_MSWINDOWS_CLIPWINDOW (ii),
2279 (HMENU)id, /* No menu */ 2279 (HMENU)id, /* No menu */
2280 (HINSTANCE) 2280 (HINSTANCE)
2281 qxeGetWindowLong 2281 qxeGetWindowLongPtr
2282 (FRAME_MSWINDOWS_HANDLE (XFRAME (frame)), 2282 (FRAME_MSWINDOWS_HANDLE (XFRAME (frame)),
2283 GWL_HINSTANCE), 2283 GWLP_HINSTANCE),
2284 NULL)) == NULL) 2284 NULL)) == NULL)
2285 gui_error ("window creation failed with code", 2285 gui_error ("window creation failed with code",
2286 make_fixnum (GetLastError())); 2286 make_fixnum (GetLastError()));
2287 2287
2288 IMAGE_INSTANCE_SUBWINDOW_ID (ii) = wnd; 2288 IMAGE_INSTANCE_SUBWINDOW_ID (ii) = wnd;
2289 qxeSetWindowLong (wnd, GWL_USERDATA, (LONG)STORE_LISP_IN_VOID(image_instance)); 2289 qxeSetWindowLongPtr (wnd, GWLP_USERDATA, (LONG_PTR)STORE_LISP_IN_VOID(image_instance));
2290 /* set the widget font from the widget face */ 2290 /* set the widget font from the widget face */
2291 if (!NILP (IMAGE_INSTANCE_WIDGET_TEXT (ii))) 2291 if (!NILP (IMAGE_INSTANCE_WIDGET_TEXT (ii)))
2292 qxeSendMessage (wnd, WM_SETFONT, 2292 qxeSendMessage (wnd, WM_SETFONT,
2293 (WPARAM) mswindows_widget_hfont 2293 (WPARAM) mswindows_widget_hfont
2294 (IMAGE_INSTANCE_WIDGET_FACE (ii), domain, 2294 (IMAGE_INSTANCE_WIDGET_FACE (ii), domain,