do not define boost::throw_exceptions if we are compiling with exceptions

[lyx.git] / src / frontends / lyx_gui.h

diff --git a/src/frontends/lyx_gui.h b/src/frontends/lyx_gui.h
index 1ef368778b61201739b969e6e70cbefd16960e4a..f3829b2af3a18c9b1a68ecac259cd4a5cd943a16 100644 (file)
--- a/src/frontends/lyx_gui.h
+++ b/src/frontends/lyx_gui.h
@@ -15,6 +15,8 @@
 
 #include "FuncStatus.h"
 
+#include <boost/function.hpp>
+
 #include <string>
 #include <vector>
 
@@ -25,6 +27,9 @@ class LyXComm;
 class LyXDataSocket;
 class LyXServerSocket;
 class FuncRequest;
+namespace lyx {
+struct RGBColor;
+}
 
 /// GUI interaction
 namespace lyx_gui {
@@ -72,6 +77,13 @@ void exit();
  */
 FuncStatus getStatus(FuncRequest const & ev);
 
+/**
+ * Given col, fills r, g, b in the range 0-255.
+ * The function returns true if successful.
+ * It returns false on failure and sets r, g, b to 0.
+ */
+bool getRGBColor(LColor_color col, lyx::RGBColor & rgbcol);
+
 /** Eg, passing LColor::black returns "000000",
  *      passing LColor::white returns "ffffff".
  */
@@ -93,19 +105,16 @@ void update_fonts();
 bool font_available(LyXFont const & font);
 
 /**
- * add a callback for I/O read notification
+ * add a callback for socket read notification
+ * @param fd socket descriptor (file/socket/etc)
  */
-void set_read_callback(int fd, LyXComm * comm);
-void set_datasocket_callback(LyXDataSocket *);
-void set_serversocket_callback(LyXServerSocket *);
+void register_socket_callback(int fd, boost::function<void()> func);
 
 /**
  * remove a I/O read callback
- * @param fd file descriptor
+ * @param fd socket descriptor (file/socket/etc)
  */
-void remove_read_callback(int fd);
-void remove_datasocket_callback(LyXDataSocket *);
-void remove_serversocket_callback(LyXServerSocket *);
+void unregister_socket_callback(int fd);
 
 } // namespace lyx_gui