X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fcombox.h;h=0dfc461a27ae6710a77f9036c81e291440e1c88c;hb=a858be7332e331e0244e4dba7b0931b6072ffd3d;hp=e0683ef7d110f642fe086a5c3cd16a5833fcd8a8;hpb=27de1486ca34aaad446adb798d71a77d6f6304da;p=lyx.git

diff --git a/src/combox.h b/src/combox.h
index e0683ef7d1..0dfc461a27 100644
--- a/src/combox.h
+++ b/src/combox.h
@@ -107,6 +107,12 @@ public:
 	void Redraw();
 	///
 	void Show();
+	///
+	static void combo_cb(FL_OBJECT *, long);
+	///
+	static void input_cb(FL_OBJECT *, long);
+	///
+        static int  peek_event(FL_FORM *, void *);
  protected:
         /// At least Hide should not be public
 	void Hide(int who = 0);
@@ -122,12 +128,6 @@ public:
 	///
 	bool is_empty;
 	///
-	static void combo_cb(FL_OBJECT *, long);
-	///
-	static void input_cb(FL_OBJECT *, long);
-	///
-        static int  peek_event(FL_FORM *, void *);
-	///
 	FL_COMBO_CB callback;
 	///
 	void *cb_arg;
@@ -178,7 +178,7 @@ void Combox::shortcut(char const* s, int i)
 }
 
 inline
-void Combox::setcallback(FL_COMBO_CB cb, void *a = NULL)
+void Combox::setcallback(FL_COMBO_CB cb, void *a = 0)
 {
    callback = cb;
    cb_arg = a;
@@ -208,7 +208,7 @@ char const*Combox::getline()
     if (type==FL_COMBOX_INPUT) 
       return fl_get_input(label);
     else
-      return ((browser) ? fl_get_browser_line(browser, sel): (char const*)NULL);
+      return ((browser) ? fl_get_browser_line(browser, sel): (char const*)0);
 }
 
 #endif