}
-static void draw_bitmaptable(FL_OBJECT *ob)
+static
+void draw_bitmaptable(FL_OBJECT *ob)
{
int i, j, lx;
FL_Coord mx, my;
char ** pdata)
{
BMTABLE_SPEC * sp = (BMTABLE_SPEC *)ob->spec;
- extern Colormap color_map;
if (sp) {
Pixmap dummy_shapemask = 0;
-#if 0
- // I can't see why this initalization is needed. (Lgb)
- XpmAttributes dumb_attributes = {0};
-#else
- XpmAttributes dumb_attributes;
-#endif
+ XpmAttributes dumb_attributes = { 0 };
sp->nx = nx;
sp->ny = ny;
sp->bx = FL_abs(ob->bw);
sp->i = -1;
sp->maxi = sp->nx * sp->ny;
sp->bdata = 0;
- dumb_attributes.colormap = color_map;
+ dumb_attributes.colormap = fl_state[fl_get_vclass()].colormap;
dumb_attributes.closeness = 30000;
dumb_attributes.valuemask = XpmColormap | XpmCloseness;
if (XCreatePixmapFromData(fl_display, fl_winget(), pdata,
XFreePixmap(fl_display, dummy_shapemask);
}
}
- XFlush(fl_display);
}
}
#else
-void fl_set_bmtable_file(FL_OBJECT *, int, int, char const *)
+void fl_set_bmtable_file(FL_OBJECT * ob, int nx, int ny, char const * filename)
{
fprintf(stderr, "Set bmtable file: Sorry, I need X11 release 6 to do "
"work!\n");
void fl_set_bmtable_pixmap_file(FL_OBJECT *ob, int nx, int ny, char const *filename)
{
- extern Colormap color_map;
+ /* extern Colormap color_map; */
BMTABLE_SPEC *sp = (BMTABLE_SPEC *)ob->spec;
if (sp) {
Pixmap dummy_shapemask = 0;
-#if 0
- XpmAttributes dumb_attributes = {0};
-#else
- XpmAttributes dumb_attributes;
-#endif
+ XpmAttributes dumb_attributes = { 0 };
sp->nx = nx;
sp->ny = ny;
sp->bx = FL_abs(ob->bw);
sp->maxi = sp->nx * sp->ny;
sp->bdata = 0;
- dumb_attributes.colormap = color_map;
+ dumb_attributes.colormap = fl_state[fl_get_vclass()].colormap;
dumb_attributes.closeness = 30000;
dumb_attributes.valuemask = XpmColormap | XpmCloseness;
XFreePixmap(fl_display, dummy_shapemask);
}
}
- XFlush(fl_display);
+ /* XFlush(fl_display); */
}
}