Hopefully fix the problem with stateText() in lyxfont.C

[lyx.git] / src / mathed / math_panel.h

diff --git a/src/mathed/math_panel.h b/src/mathed/math_panel.h
index 633f1619a708e566f542bbcc13c76296e2fb86f0..b6ce86ca5a731458606f8a7e413d6ebd21f9d981 100644 (file)
--- a/src/mathed/math_panel.h
+++ b/src/mathed/math_panel.h
@@ -7,7 +7,7 @@
  * 
  *  Dependencies: Xlib, Xpm, XForms, Lyx
  *
- *  Copyright: (c) 1996, Alejandro Aguilar Sierra 
+ *  Copyright: 1996, Alejandro Aguilar Sierra 
  *
  *   You are free to use and modify it under the terms of
  *   the GNU General Public Licence version 2 or later.
@@ -33,17 +33,17 @@ enum  {
 };
 
 ///
-typedef FL_OBJECT* FL_OBJECTP;
+typedef FL_OBJECT * FL_OBJECTP;
 
 /// Class to manage bitmap menu bars
 class BitmapMenu {
   ///
-   static BitmapMenu *active;
+   static BitmapMenu * active;
    ///
    friend int peek_event(FL_FORM *, void *);
- protected:
+protected:
    ///
-   BitmapMenu *next, *prev;
+   BitmapMenu * next, * prev;
    ///
    int nb;             // Number of bitmaps
                            ///
@@ -53,20 +53,21 @@ class BitmapMenu {
                            ///
    int x, y, w, h;
    ///
-   FL_FORM *form;
+   FL_FORM * form;
    ///
-   FL_OBJECTP *bitmap;
+   FL_OBJECTP * bitmap;
    ///
-   FL_OBJECT *button;
+   FL_OBJECT * button;
  public:
    ///
-   BitmapMenu(int n, FL_OBJECT* bt, BitmapMenu* prevx=NULL);
+   BitmapMenu(int n, FL_OBJECT * bt, BitmapMenu * prevx= 0);
    ///
    ~BitmapMenu();
    ///
-   FL_OBJECT* AddBitmap(int id,
-                       int nx, int ny, int bw, int bh,
-                       char* data, Bool vert=True); // Why Bool?
+   FL_OBJECT * AddBitmap(int id,
+                        int nx, int ny, int bw, int bh,
+                        unsigned char const * data,
+                        Bool vert= True); // Why Bool?
    ///
    void Create();
    ///
@@ -78,9 +79,12 @@ class BitmapMenu {
    ///
    void Next();
    ///
-   int  GetIndex(FL_OBJECT* ob);
+   int  GetIndex(FL_OBJECT * ob);
 };
 
+// This is just a wrapper around peek_event()
+extern "C" int C_peek_event(FL_FORM * form, void * ptr);
+
 
 inline
 void BitmapMenu::Prev()  {