anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-24 17:09:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

gnome compilation fixes from Michael

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3753 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2002-03-14 14:03:54 +00:00
parent 870b665955
commit 80a04f5d03
5 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2002-03-14 Michael A. Koziarski <michael@koziarski.com>
* configure.in: First stage of fixing the gnome compile problems.
Linking problems to be fixed next.
2002-03-12 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
* README: add bulgarian

6
configure.in
View File

@ -198,6 +198,8 @@ case "$lyx_use_frontend" in
`
;;
gnome)
LYX_PATH_XPM
LYX_PATH_XFORMS
AM_PATH_GTKMM(1.2.1,,
AC_MSG_ERROR(Cannot find GTK--: Please install Version 1.2.1+))
AM_PATH_GNOMEMM
@ -217,8 +219,8 @@ dnl Ensure gnome-config is available...
FRONTEND="xforms gnome"
FRONTEND_GUILIB="gnome/*.lo"
FRONTEND_LDFLAGS="\$(GNOMEMM_LIBDIR)"
FRONTEND_INCLUDES="-I\${srcdir}/gnome \$(GNOMEMM_INCLUDEDIR) \$(GTKMM_CFLAGS) `gnome-config --cflags libglade gnomeui`"
FRONTEND_LIBS="\$(GNOMEMM_LIBS) \$(GTKMM_LIBS) `gnome-config --libs libglade gnomeui`";;
FRONTEND_INCLUDES="-I\${srcdir}/gnome -I\${srcdir}/xforms \$(GNOMEMM_INCLUDEDIR) \$(GTKMM_CFLAGS) `gnome-config --cflags libglade gnomeui`"
FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ \$(GNOMEMM_LIBS) \$(GTKMM_LIBS) `gnome-config --libs libglade gnomeui`";;
qt2)
LYX_PATH_XPM
LYX_PATH_XFORMS

7
src/frontends/gnome/ChangeLog
View File

@ -1,3 +1,10 @@
2002-03-14 Michael A. Koziarski <michael@koziarski.org>
* Timeout_pimpl.C
* Timeout_pimpl.h: implemented running to fix compilation, linking
fix still to come
2002-03-11 Lars Gullik Bjønnes <larsbj@birdstep.com>
* docygen fixes.

9
src/frontends/gnome/Timeout_pimpl.C
View File

@ -4,6 +4,7 @@
* Read COPYING
*
* \author Baruch Even
* \author Michael Koziarski
*/
#include <config.h>
@ -28,7 +29,11 @@ void Timeout::Pimpl::reset()
stop();
}
bool Timeout::Pimpl::running() const
{
return running_;
}
void Timeout::Pimpl::start()
{
if (conn_.connected()) {
@ -40,12 +45,14 @@ void Timeout::Pimpl::start()
SigC::slot(this, &Timeout::Pimpl::timeoutEvent),
owner_->timeout_ms
);
running_ = true;
}
void Timeout::Pimpl::stop()
{
conn_.disconnect();
running_ = false;
}

7
src/frontends/gnome/Timeout_pimpl.h
View File

@ -31,7 +31,10 @@ public:
/// stop the timer
void stop();
/// reset
void reset();
void reset();
/// Is the timer running?
bool running() const;
public:
/// The timeout signal, this gets called when the timeout passed.
@ -41,6 +44,8 @@ private:
Timeout * owner_;
/// Timer connection
SigC::Connection conn_;
/// Used for running as SigC::Connection::connected() isn't const
bool running_;
};
#endif