fixes to compile and link gtk

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7913 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
José Matox 2003-10-13 15:23:45 +00:00
parent 0336ebd447
commit f91146d22b
2 changed files with 15 additions and 5 deletions

View File

@ -1,3 +1,11 @@
2003-10-13 José Matos <jamatos@lyx.org>
* 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 <leeming@lyx.org>
* lyx_gui.C (set_datasocket_callback, set_serversocket_callback,

View File

@ -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<string> 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 */)
{}