>>>>> "Michael" == Michael  <[EMAIL PROTECTED]> writes:

Michael> So, what can I do? Wait for a patch or a future release? Or
Michael> is it easy for me to do something by myself? Michael

Hmm, try to apply the following change. If you do not know how the
apply a patch, the idea is to replace sqrt with sqrt_pix in
images/sqrt.xpm and src/mathed/math_panel.C (two places).

Tell us what happens next :)

I'd be interested to see the warnings too.

JMarc

Index: images/sqrt.xpm
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/images/sqrt.xpm,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 sqrt.xpm
--- images/sqrt.xpm     1999/09/27 18:44:30     1.1.1.1
+++ images/sqrt.xpm     1999/11/30 14:41:12
@@ -1,5 +1,5 @@
 /* XPM */
-static char *sqrt[] = {
+static char *sqrt_pix[] = {
 /* width height num_colors chars_per_pixel */
 "    20    20        3            1",
 /* colors */
Index: src/mathed/math_panel.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_panel.C,v
retrieving revision 1.7
diff -u -r1.7 math_panel.C
--- src/mathed/math_panel.C     1999/11/20 16:14:02     1.7
+++ src/mathed/math_panel.C     1999/11/30 14:41:12
@@ -272,7 +272,7 @@
 {
    switch (d) {
     case MM_FRAC: return frac;
-    case MM_SQRT: return sqrt;
+    case MM_SQRT: return sqrt_pix;
     case MM_DELIM: return delim;
     case MM_MATRIX: return matrix;
     case MM_EQU: return equation; 
@@ -298,7 +298,7 @@
                       delim_bits);
    fl_set_bmtable_maxitems(fd_delim->menu, 23);
    
-   fl_set_pixmap_data(fd_panel->sqrt, sqrt);
+   fl_set_pixmap_data(fd_panel->sqrt, sqrt_pix);
    fl_set_pixmap_data(fd_panel->frac, frac);
    fl_set_pixmap_data(fd_panel->delim, delim);
    fl_set_pixmap_data(fd_panel->deco, deco);


Michael> "Lars Gullik Bjønnes" wrote:

>> Jean-Marc Lasgouttes <[EMAIL PROTECTED]> writes:
>> 
>> | Michael> -DHAVE_CONFIG_H -I. -I. -I../../src -I../../images
>> -I./../ | Michael> -I/home/fan/local/include -I/usr/local/include |
>> Michael> -I/usr/openwin/include -g -c math_macro.C CC
>> -DHAVE_CONFIG_H | Michael> -I. -I. -I../../src -I../../images
>> -I./../ | Michael> -I/home/fan/local/include -I/usr/local/include |
>> Michael> -I/usr/openwin/include -g -c math_panel.C | Michael>
>> "../../images/delim0.xpm", line 4: Warning: String literal |
>> Michael> converted to char* in initialization. ... (all this kind
>> of | Michael> warnings) ... | | Hmm, lars, I thought we had done
>> something about it. Should these | images use char const*?
>> 
>> Why not.
>> 
>> | This one is interesting... The relevant line for the first error
>> is | the last in the following snippet: | | char**
>> mathed_get_pixmap_from_icon(int d) | { | switch (d) { | case
>> MM_FRAC: return frac; | case MM_SQRT: return sqrt; | | The problem
>> is probably that the compiler wants to use the sqrt() | function
>> instead of a pixmap (maybe is it built-in). Lars, do you see | a
>> solution other than renaming the pixmap?
>> 
>> No, I have seen this before as a warning, but did not act upon it.
>> I think we should rename the pixmap (or begin using namespaces)
>> 
>> Lgb

Reply via email to