Mercurial > hg > xemacs-beta
diff src/glyphs-msw.c @ 371:cc15677e0335 r21-2b1
Import from CVS: tag r21-2b1
| author | cvs |
|---|---|
| date | Mon, 13 Aug 2007 11:03:08 +0200 |
| parents | 4711e16a8e49 |
| children | 6240c7796c7a |
line wrap: on
line diff
--- a/src/glyphs-msw.c Mon Aug 13 11:01:58 2007 +0200 +++ b/src/glyphs-msw.c Mon Aug 13 11:03:08 2007 +0200 @@ -521,8 +521,6 @@ IMAGE_INSTANCE_PIXMAP_HEIGHT (ii), SRCCOPY)) { - DeleteObject (newbmp); - DeleteDC (hdcDst); return 0; } @@ -555,8 +553,6 @@ IMAGE_INSTANCE_PIXMAP_HEIGHT (ii), SRCCOPY)) { - DeleteObject (newmask); - DeleteDC (hdcDst); return NULL; } @@ -1011,10 +1007,8 @@ #define OIC_BANG 32515 #define OIC_NOTE 32516 #define OIC_WINLOGO 32517 -#if defined (__CYGWIN32__) && CYGWIN_VERSION_DLL_MAJOR < 21 #define LR_SHARED 0x8000 #endif -#endif static CONST resource_t bitmap_table[] = { @@ -1043,7 +1037,7 @@ { "size", OBM_SIZE }, { "btsize", OBM_BTSIZE }, { "check", OBM_CHECK }, - { "checkboxes", OBM_CHECKBOXES }, + { "cehckboxes", OBM_CHECKBOXES }, { "btncorners" , OBM_BTNCORNERS }, {0} }; @@ -1542,7 +1536,7 @@ int mask, COLORREF fg, COLORREF bg) { int old_width = (width + 7)/8; - int new_width = BPLINE (2*((width + 15)/16)); + int new_width = 2*((width + 15)/16); unsigned char *offset; void *bmp_buf = 0; unsigned char *new_data, *new_offset; @@ -1734,10 +1728,10 @@ if (NILP (background)) background = pointer_bg; - IMAGE_INSTANCE_PIXMAP_HOTSPOT_X (ii) = - find_keyword_in_vector (instantiator, Q_hotspot_x); - IMAGE_INSTANCE_PIXMAP_HOTSPOT_Y (ii) = - find_keyword_in_vector (instantiator, Q_hotspot_y); + XSETINT (IMAGE_INSTANCE_PIXMAP_HOTSPOT_X (ii), + find_keyword_in_vector (instantiator, Q_hotspot_x)); + XSETINT (IMAGE_INSTANCE_PIXMAP_HOTSPOT_Y (ii), + find_keyword_in_vector (instantiator, Q_hotspot_y)); IMAGE_INSTANCE_PIXMAP_FG (ii) = foreground; IMAGE_INSTANCE_PIXMAP_BG (ii) = background; if (COLOR_INSTANCEP (foreground))