Andreas' patch to prevent crash on click on previewd inset

[lyx.git] / src / mathed / math_support.C

diff --git a/src/mathed/math_support.C b/src/mathed/math_support.C
index f1f979a9025a2ac3712ec09d471a9371918e3b9c..f857d8e753c09c41c888ff3a1fb9bdad593b0e50 100644 (file)
--- a/src/mathed/math_support.C
+++ b/src/mathed/math_support.C
@@ -24,9 +24,8 @@
 #include "frontends/font_metrics.h"
 #include "frontends/lyx_gui.h"
 
-#include "support/std_sstream.h"
-
 #include <map>
+#include <sstream>
 
 
 using std::string;
@@ -336,7 +335,8 @@ named_deco_struct deco_table[] = {
 std::map<string, deco_struct> deco_list;
 
 // sort the table on startup
-struct init_deco_table {
+class init_deco_table {
+public:
        init_deco_table() {
                unsigned const n = sizeof(deco_table) / sizeof(deco_table[0]);
                for (named_deco_struct * p = deco_table; p != deco_table + n; ++p) {
@@ -458,14 +458,6 @@ void mathed_draw_deco(PainterInfo & pi, int x, int y, int w, int h,
                                int(x + xx + 0.5), int(y + yy + 0.5),
                                int(x + x2 + 0.5), int(y + y2 + 0.5),
                                LColor::math);
-
-                       lyxerr << "drew line "
-                              << "xx=" << xx << ", yy=" << yy
-                              << ", x2 = " << x2 << ", y2 = " << y2 << '\n'
-                              << int(x + xx + 0.5) << ", "
-                              << int(y + yy + 0.5) << ", "
-                              << int(x + x2 + 0.5) << ", "
-                              << int(y + y2 + 0.5) << std::endl;
                } else {
                        int xp[32];
                        int yp[32];
@@ -488,14 +480,6 @@ void mathed_draw_deco(PainterInfo & pi, int x, int y, int w, int h,
 }
 
 
-// In the future maybe we use a better fonts renderer
-void drawStr(PainterInfo & pi, LyXFont const & font,
-       int x, int y, string const & str)
-{
-       pi.pain.text(x, y, str, font);
-}
-
-
 void drawStrRed(PainterInfo & pi, int x, int y, string const & str)
 {
        LyXFont f = pi.base.font;
@@ -512,12 +496,6 @@ void drawStrBlack(PainterInfo & pi, int x, int y, string const & str)
 }
 
 
-void drawChar(PainterInfo & pi, LyXFont const & font, int x, int y, char c)
-{
-       pi.pain.text(x, y, c, font);
-}
-
-
 void math_font_max_dim(LyXFont const & font, int & asc, int & des)
 {
        asc = font_metrics::maxAscent(font);
@@ -590,7 +568,7 @@ fontinfo fontinfos[] = {
        {"textnormal",    inh_family, inh_series,
                          LyXFont::UP_SHAPE, LColor::foreground},
        {"textrm",        LyXFont::ROMAN_FAMILY,
-                         inh_series,LyXFont::UP_SHAPE,LColor::foreground},
+                         inh_series, LyXFont::UP_SHAPE,LColor::foreground},
        {"textsc",        inh_family, inh_series,
                          LyXFont::SMALLCAPS_SHAPE, LColor::foreground},
        {"textsf",        LyXFont::SANS_FAMILY, inh_series,
@@ -609,16 +587,14 @@ fontinfo fontinfos[] = {
        // LyX internal usage
        {"lyxtex",        inh_family, inh_series,
                          LyXFont::UP_SHAPE, LColor::latex},
-       {"lyxert",        LyXFont::TYPEWRITER_FAMILY, inh_series,
-                         LyXFont::UP_SHAPE, LColor::latex},
        {"lyxsymbol",     LyXFont::SYMBOL_FAMILY, inh_series,
                          inh_shape, LColor::math},
        {"lyxboldsymbol", LyXFont::SYMBOL_FAMILY, LyXFont::BOLD_SERIES,
                          inh_shape, LColor::math},
        {"lyxblacktext",  LyXFont::ROMAN_FAMILY, LyXFont::MEDIUM_SERIES,
-                    LyXFont::UP_SHAPE, LColor::foreground},
+                         LyXFont::UP_SHAPE, LColor::foreground},
        {"lyxnochange",   inh_family, inh_series,
-                    inh_shape, LColor::foreground},
+                         inh_shape, LColor::foreground},
        {"lyxfakebb",     LyXFont::TYPEWRITER_FAMILY, LyXFont::BOLD_SERIES,
                          LyXFont::UP_SHAPE, LColor::math},
        {"lyxfakecal",    LyXFont::SANS_FAMILY, LyXFont::MEDIUM_SERIES,