prepare for 1.1.6pre2

[lyx.git] / src / bmtable.h

diff --git a/src/bmtable.h b/src/bmtable.h
index edb340d453550c000ab4ed291214a736adaab472..a55c423f0926d59c3e4e34bea6d9c7046485052a 100644 (file)
--- a/src/bmtable.h
+++ b/src/bmtable.h
@@ -6,23 +6,32 @@
  *  Description: A bitmap table uses a single bitmap to simulate a 2d array 
  *               of bitmap buttons. It can be used to build bitmap menus.
  *               
- *  Copyright (C) 1995,1996 Alejandro Aguilar Sierra 
+ *  Copyright 1995, 1996 Alejandro Aguilar Sierra 
  *
  *  You are free to use and modify this code under the terms of
  *  the GNU General Public Licence version 2 or later. 
  * 
  */ 
 
-#ifndef __BMTABLE_H__
-#define __BMTABLE_H__ 
+#ifndef BMTABLE_H
+#define BMTABLE_H 
+
+#ifdef __GNUG__
+#pragma interface
+#endif
 
 #include FORMS_H_LOCATION
 
-///
+#if defined(__cplusplus)
+extern "C"
+{
+#endif
+
+/**/
 #define FL_BMTABLE 1500
-/// A flat bitmap table
+/* A flat bitmap table */
 #define FL_BMTABLE_FLAT 0
-/// A grided bitmap table
+/* A grided bitmap table */
 #define FL_BMTABLE_GRID 1
 
 
@@ -34,25 +43,26 @@
  */
 #define FL_BMTABLE_BOXTYPE     FL_UP_BOX
 
-///
+
+/**/
 FL_OBJECT *fl_create_bmtable(int, FL_Coord, FL_Coord, 
                             FL_Coord, FL_Coord, char const *);
-///
+/**/
 FL_OBJECT *fl_add_bmtable(int, FL_Coord, FL_Coord, 
                          FL_Coord, FL_Coord, char const *);
 
 /** Same as fl_get_button_numb() */
 int fl_get_bmtable_numb(FL_OBJECT *ob);
-///
+/**/
 void fl_set_bmtable(FL_OBJECT *, int pushed, int pos);
 
 /** Number of columns and rows, and the background bitmap */
-void fl_set_bmtable_data(FL_OBJECT *, int, int, int, int , char *);
-///
+void fl_set_bmtable_data(FL_OBJECT *, int, int, int, int , unsigned char const *);
+/**/
 void fl_set_bmtable_pixmap_data(FL_OBJECT *, int, int, char **);
-///
+/**/
 void fl_set_bmtable_file(FL_OBJECT *, int, int, char const *);
-///
+/**/
 void fl_set_bmtable_pixmap_file(FL_OBJECT *, int, int, char const *);
 
 /** Adjust bitmap origin (ox, oy) and cell dimensions (dx, dy) incrementally */
@@ -60,7 +70,7 @@ void fl_set_bmtable_adjust(FL_OBJECT *, int ox, int oy, int dx, int dy);
 
 /** The number of items is by default nc x nr, but you can change it */
 void fl_set_bmtable_maxitems(FL_OBJECT *, int);
-///
+/**/
 int fl_get_bmtable_maxitems(FL_OBJECT *); 
 
 /** Returns the index of the selected item or -1 if none was selected */
@@ -84,5 +94,9 @@ void fl_free_bmtable_bitmap(FL_OBJECT *ob);
 /** Free the current pixmap in preparation for installing a new one */
 void fl_free_bmtable_pixmap(FL_OBJECT *ob);
 
-#endif  /* __BMTABLE_H__ */
+#if defined(__cplusplus)
+}
+#endif
+
+#endif  /* BMTABLE_H */