projects
/
chise
/
xemacs-chise.git.1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update.
[chise/xemacs-chise.git.1]
/
src
/
glyphs-msw.c
diff --git
a/src/glyphs-msw.c
b/src/glyphs-msw.c
index
883ab53
..
72902aa
100644
(file)
--- a/
src/glyphs-msw.c
+++ b/
src/glyphs-msw.c
@@
-1460,7
+1460,7
@@
in this Software without prior written authorization from the X Consortium.
/* shared data for the image read/parse logic */
static short hexTable[256]; /* conversion value */
/* shared data for the image read/parse logic */
static short hexTable[256]; /* conversion value */
-static int initialized = FALSE; /* easier to fill in at run time */
+static int hex_initialized = FALSE; /* easier to fill in at run time */
/*
* Table index for the hex values. Initialized once, first time.
/*
* Table index for the hex values. Initialized once, first time.
@@
-1494,7
+1494,7
@@
initHexTable (void)
hexTable['}'] = -1; hexTable['\n'] = -1;
hexTable['\t'] = -1;
hexTable['}'] = -1; hexTable['\n'] = -1;
hexTable['\t'] = -1;
- initialized = TRUE;
+ hex_initialized = TRUE;
}
/*
}
/*
@@
-1557,7
+1557,7
@@
int read_bitmap_data (FILE* fstream, unsigned int *width,
#define Xmalloc(size) malloc(size)
/* first time initialization */
#define Xmalloc(size) malloc(size)
/* first time initialization */
- if (initialized == FALSE) initHexTable();
+ if (hex_initialized == FALSE) initHexTable();
/* error cleanup and return macro */
#define RETURN(code) { if (data) free (data); return code; }
/* error cleanup and return macro */
#define RETURN(code) { if (data) free (data); return code; }
@@
-1720,9
+1720,9
@@
xbm_create_bitmap_from_data (HDC hdc, char *data,
for (j=0; j<old_width; j++)
{
for (j=0; j<old_width; j++)
{
- int byte = offset[j];
+ int bite = offset[j];
new_offset[j] = ~ (unsigned char)
new_offset[j] = ~ (unsigned char)
- ((flip_table[byte & 0xf] << 4) + flip_table[byte >> 4]);
+ ((flip_table[bite & 0xf] << 4) + flip_table[bite >> 4]);
}
}
}
}
@@
-1903,7
+1903,7
@@
init_image_instance_from_xbm_inline (Lisp_Image_Instance *ii,
break;
default:
break;
default:
- abort ();
+ ABORT ();
}
}
}
}
@@
-1977,6
+1977,9
@@
mswindows_xbm_instantiate (Lisp_Object image_instance,
#ifdef __cplusplus
extern "C" {
#endif
#ifdef __cplusplus
extern "C" {
#endif
+#ifndef __STDC__ /* Needed to avoid prototype warnings */
+#define __STDC__
+#endif
#include <compface.h>
#ifdef __cplusplus
}
#include <compface.h>
#ifdef __cplusplus
}
@@
-2368,6
+2371,13
@@
mswindows_redisplay_widget (Lisp_Image_Instance *p)
}
}
}
}
+/* Account for some of the limitations with widget images. */
+static int
+mswindows_widget_border_width (void)
+{
+ return DEFAULT_WIDGET_BORDER_WIDTH;
+}
+
/* register widgets into our hashtable so that we can cope with the
callbacks. The hashtable is weak so deregistration is handled
automatically */
/* register widgets into our hashtable so that we can cope with the
callbacks. The hashtable is weak so deregistration is handled
automatically */
@@
-3078,7
+3088,7
@@
mswindows_combo_box_instantiate (Lisp_Object image_instance, Lisp_Object instant
default_face_font_info (domain, 0, 0, &height, 0, 0);
GET_LIST_LENGTH (items, len);
default_face_font_info (domain, 0, 0, &height, 0, 0);
GET_LIST_LENGTH (items, len);
- height = (height + WIDGET_BORDER_HEIGHT * 2 ) * len;
+ height = (height + DEFAULT_WIDGET_BORDER_WIDTH * 2 ) * len;
IMAGE_INSTANCE_HEIGHT (ii) = height;
/* Now create the widget. */
IMAGE_INSTANCE_HEIGHT (ii) = height;
/* Now create the widget. */
@@
-3236,6
+3246,7
@@
console_type_create_glyphs_mswindows (void)
CONSOLE_HAS_METHOD (mswindows, image_instance_hash);
CONSOLE_HAS_METHOD (mswindows, init_image_instance_from_eimage);
CONSOLE_HAS_METHOD (mswindows, locate_pixmap_file);
CONSOLE_HAS_METHOD (mswindows, image_instance_hash);
CONSOLE_HAS_METHOD (mswindows, init_image_instance_from_eimage);
CONSOLE_HAS_METHOD (mswindows, locate_pixmap_file);
+ CONSOLE_HAS_METHOD (mswindows, widget_border_width);
/* image methods - printer */
CONSOLE_INHERITS_METHOD (msprinter, mswindows, print_image_instance);
/* image methods - printer */
CONSOLE_INHERITS_METHOD (msprinter, mswindows, print_image_instance);