X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fcombox.h;h=70974c8f062bc9ebf6f730abc3ed7ef2ccb64c61;hb=9e5bd1d609877e602cb697bc695d410e2ab48e0d;hp=0dfc461a27ae6710a77f9036c81e291440e1c88c;hpb=a8a90bf854958562ddf588e3eddbc2b7cfa7f976;p=lyx.git

diff --git a/src/combox.h b/src/combox.h
index 0dfc461a27..70974c8f06 100644
--- a/src/combox.h
+++ b/src/combox.h
@@ -4,7 +4,7 @@
  *          encapsulated to get a combobox-like object. All XForms 
  *          functions are hidden.         
  * 
- *  GNU Copyleft (C) 1996 Alejandro Aguilar Sierra <asierra@servidor.unam.mx>
+ *  GNU Copyleft 1996 Alejandro Aguilar Sierra <asierra@servidor.unam.mx>
  *                        and the LyX Team.
  * 
  *  Dependencies:  Only XForms, but created to be used with LyX.
@@ -21,15 +21,15 @@
  *    and support for middle and right buttons, as XForms choice object.
  */ 
 
-#ifndef _COMBOX_H_
-#define _COMBOX_H_
+#ifndef COMBOX_H
+#define COMBOX_H
 
 #ifdef __GNUG__
 #pragma interface
 #endif
 
 #include FORMS_H_LOCATION
-#include <stdlib.h>
+#include <cstdlib>
 
 ///
 enum combox_type {
@@ -42,7 +42,7 @@ enum combox_type {
 };
 
 /// callback prototype
-typedef void (*FL_COMBO_CB) (int, void*);
+typedef void (*FL_COMBO_CB) (int, void *);
 /// pre post prototype
 typedef void (*FL_COMBO_PRE_POST) ();
 
@@ -51,7 +51,7 @@ typedef void (*FL_COMBO_PRE_POST) ();
 class Combox {
 public:
 	///
-	Combox(combox_type t=FL_COMBOX_NORMAL);
+	explicit Combox(combox_type t = FL_COMBOX_NORMAL);
 	///
 	~Combox();
 
@@ -60,20 +60,20 @@ public:
 	void add(int x, int y, int w, int hmin, int hmax);
 	
 	/// Add lines. Same as for fl_browser object
-	void addline(char const*);
+	void addline(char const *);
 	/// Add lines. Same as for fl_browser object
-	void addto(char const*);
+	void addto(char const *);
 	
 	/// Returns the selected item
 	int get();
    
 	/// Returns a pointer to the selected line of text
-	char const*getline();
+	char const * getline();
    
 	///  Select an arbitrary item
 	void select(int);
 	///
-        bool select_text(char const*);
+        bool select_text(char const *);
    
 	///  Clear all the list
 	void clear();
@@ -102,7 +102,7 @@ public:
 	///
 	void deactivate();
 	///
-        void shortcut(char const*, int);
+        void shortcut(char const *, int);
 	///
 	void Redraw();
 	///
@@ -117,7 +117,7 @@ public:
         /// At least Hide should not be public
 	void Hide(int who = 0);
 	///
-	FL_OBJECT *browser;
+	FL_OBJECT * browser;
  private:
 	///
 	combox_type type;
@@ -130,15 +130,15 @@ public:
 	///
 	FL_COMBO_CB callback;
 	///
-	void *cb_arg;
+	void * cb_arg;
 	///
 	FL_COMBO_PRE_POST _pre;
 	///
 	FL_COMBO_PRE_POST _post;
 	///
-	FL_OBJECT *button;
+	FL_OBJECT * button;
 	///
-	FL_OBJECT *label;
+	FL_OBJECT * label;
 	///
         FL_FORM* form;
 };
@@ -148,7 +148,7 @@ public:
 //-----------------  Inline methods  --------------------------- 
 
 inline
-void Combox::addto(char const* text)
+void Combox::addto(char const * text)
 {
 	if (browser) {
 		fl_addto_browser(browser, text);
@@ -156,61 +156,67 @@ void Combox::addto(char const* text)
 	}
 }
 
+
 inline
 void Combox::resize(unsigned r)
 {
    fl_set_object_resize(button, r);
-   if (label!=button) fl_set_object_resize(label, r); 
+   if (label!= button) fl_set_object_resize(label, r); 
 }
 
+
 inline
 void Combox::gravity(unsigned g1, unsigned g2)
 {
    fl_set_object_gravity(button, g1, g2);
-   if (label!=button) fl_set_object_gravity(label, g1, g2); 
+   if (label!= button) fl_set_object_gravity(label, g1, g2); 
 }
 
+
 inline
-void Combox::shortcut(char const* s, int i)
+void Combox::shortcut(char const * s, int i)
 {
    if (button)
-      fl_set_object_shortcut(button,s,i);
+      fl_set_object_shortcut(button, s, i);
 }
 
+
 inline
-void Combox::setcallback(FL_COMBO_CB cb, void *a = 0)
+void Combox::setcallback(FL_COMBO_CB cb, void * a = 0)
 {
    callback = cb;
    cb_arg = a;
 }
 
+
 inline
 void Combox::setpre(FL_COMBO_PRE_POST cb)
 {
 	_pre = cb;
 }
 
+
 inline
 void Combox::setpost(FL_COMBO_PRE_POST cb)
 {
 	_post = cb;
 }
 
+
 inline
 int Combox::get()
 {
    return sel;
 }
 
+
 inline
-char const*Combox::getline()
+char const * Combox::getline()
 {
-    if (type==FL_COMBOX_INPUT) 
+    if (type == FL_COMBOX_INPUT) 
       return fl_get_input(label);
     else
-      return ((browser) ? fl_get_browser_line(browser, sel): (char const*)0);
+      return browser ? fl_get_browser_line(browser, sel) : 0;
 }
 
 #endif
-
-