my changes during the holidyas...i expect some compilers to have some problems, but...

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

diff --git a/src/mathed/math_symbols.C b/src/mathed/math_symbols.C
index c8df4a9b45adb1634b15d529ab0bf3f20751bdea..8d268a9a93ff8add142c9eb4420cd518f9186664 100644 (file)
--- a/src/mathed/math_symbols.C
+++ b/src/mathed/math_symbols.C
@@ -39,12 +39,10 @@ using std::max;
 #include "math_panel.h"                 
 #include "math_parser.h"
 
-extern void SmallUpdate(signed char);
 extern void BeforeChange();
 extern void Update(signed char);
 extern int UnlockInset(UpdatableInset *);
 extern short greek_kb_flag;
-extern MiniBuffer * minibuffer;
 
 extern BufferView * current_view;
 
@@ -145,7 +143,7 @@ BitmapMenu::BitmapMenu(int n,  FL_OBJECT * bt, BitmapMenu * prevx): nb(n)
    w = h = 0;
    form = 0;
    i = 0;
-   ww = 2*FL_abs(FL_BOUND_WIDTH);
+   ww = 2 * FL_abs(FL_BOUND_WIDTH);
    x = y = ww;
    y += 8;
    bitmap = new FL_OBJECTP[nb];
@@ -245,16 +243,16 @@ int peek_event(FL_FORM * /*form*/, void *xev)
    if (BitmapMenu::active == 0)
      return 0;
   
-   if(((XEvent *)xev)->type == ButtonPress)
+   if(static_cast<XEvent *>(xev)->type == ButtonPress)
    {
         BitmapMenu::active->Hide();
         return 1;
    }
-   if(((XEvent *)xev)->type == KeyPress)
+   if(static_cast<XEvent *>(xev)->type == KeyPress)
    {
       char c[5];
       KeySym keysym;
-      XLookupString(&((XEvent *)xev)->xkey, &c[0], 5, &keysym, 0);
+      XLookupString(&static_cast<XEvent *>(xev)->xkey, &c[0], 5, &keysym, 0);
       if (keysym == XK_Left) 
        BitmapMenu::active->Prev(); else
       if (keysym == XK_Right) 
@@ -307,7 +305,7 @@ extern "C" void math_cb(FL_OBJECT* ob, long data)
   
    if (s)  {
       if (current_view->available() && lyxrc->display_shortcuts) {
-         minibuffer->Set("Inserting symbol ", s);
+         current_view->owner()->getMiniBuffer()->Set("Inserting symbol ", s);
       }
       current_view->owner()->getLyXFunc()->Dispatch(LFUN_INSERT_MATH, s);
    }