From f91146d22b77d0cb39804cd9afd01833170576c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Matox?= Date: Mon, 13 Oct 2003 15:23:45 +0000 Subject: [PATCH] fixes to compile and link gtk git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7913 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/gtk/ChangeLog | 8 ++++++++ src/frontends/gtk/lyx_gui.C | 12 +++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/frontends/gtk/ChangeLog b/src/frontends/gtk/ChangeLog index e7af1db63d..40c3c5834d 100644 --- a/src/frontends/gtk/ChangeLog +++ b/src/frontends/gtk/ChangeLog @@ -1,3 +1,11 @@ +2003-10-13 José Matos + + * lyx_gui.C (set_datasocket_callback, set_serversocket_callback, + remove_datasocket_callback, remove_serversocket_callback): + prefix those fucntions with lyx_gui:: to link correctly. + + * lyx_gui.C (start): fix call to dispatch. + 2003-10-13 Angus Leeming * lyx_gui.C (set_datasocket_callback, set_serversocket_callback, diff --git a/src/frontends/gtk/lyx_gui.C b/src/frontends/gtk/lyx_gui.C index c70778345a..20a620b305 100644 --- a/src/frontends/gtk/lyx_gui.C +++ b/src/frontends/gtk/lyx_gui.C @@ -21,9 +21,11 @@ #include "support/path_defines.h" #include "debug.h" +#include "funcrequest.h" #include "gettext.h" #include "LColor.h" +#include "LyXAction.h" #include "lyx_main.h" #include "lyxrc.h" #include "lyxfont.h" @@ -336,7 +338,7 @@ void lyx_gui::start(string const & batch, std::vector const & files) // handle the batch commands the user asked for if (!batch.empty()) { - view.getLyXFunc().dispatch(batch); + view.getLyXFunc().dispatch(lyxaction.lookupFunc(batch)); } // enter the event loop @@ -435,19 +437,19 @@ void lyx_gui::remove_read_callback(int fd) } -void set_datasocket_callback(LyXDataSocket * /* p */) +void lyx_gui::set_datasocket_callback(LyXDataSocket * /* p */) {} -void remove_datasocket_callback(LyXDataSocket * /* p */) +void lyx_gui::remove_datasocket_callback(LyXDataSocket * /* p */) {} -void set_serversocket_callback(LyXServerSocket * /* p */) +void lyx_gui::set_serversocket_callback(LyXServerSocket * /* p */) {} -void remove_serversocket_callback(LyXServerSocket * /* p */) +void lyx_gui::remove_serversocket_callback(LyXServerSocket * /* p */) {}