Introduce LFUN_PRINT.

[lyx.git] / src / frontends / xforms / bmtable.c

diff --git a/src/frontends/xforms/bmtable.c b/src/frontends/xforms/bmtable.c
index ae7fd864835baa01d3191e51fdab296588b32eb9..241a415fb7365ad9c5cda32a14bbe767f6a20151 100644 (file)
--- a/src/frontends/xforms/bmtable.c
+++ b/src/frontends/xforms/bmtable.c
@@ -6,18 +6,13 @@
  * \author Alejandro Aguilar Sierra
  *
  * Full author contact details are available in file CREDITS
- *
- * Implementation of the XForms object bmtable.
- *
- * A bitmap table uses a single bitmap to simulate a 2d array
- * of bitmap buttons. It can be used to build bitmap menus.
  */
 
 #include <config.h>
 
 #include <stdlib.h>
 #include "bmtable.h"
-#include XPM_H_LOCATION
+#include "lyx_xpm.h"
 
 #if defined(__cplusplus)
 extern "C"
@@ -320,6 +315,7 @@ void fl_set_bmtable_pixmap_file(FL_OBJECT *ob, int nx, int ny, char const *filen
        if (sp) {
                Pixmap dummy_shapemask = 0;
                XpmAttributes dumb_attributes = { 0 };
+               XpmColorSymbol xpm_col;
                sp->nx = nx;
                sp->ny = ny;
                sp->bx = FL_abs(ob->bw);
@@ -330,7 +326,6 @@ void fl_set_bmtable_pixmap_file(FL_OBJECT *ob, int nx, int ny, char const *filen
                sp->maxi = sp->nx * sp->ny;
                sp->bdata = 0;
 
-               XpmColorSymbol xpm_col;
                xpm_col.name = NULL;
                xpm_col.value = "None";
                xpm_col.pixel = fl_get_flcolor(ob->col1);