gnome compilation fixes from Michael

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3753 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index f0b34219f343a893939c67d88bed3ea5b1a566e5..55508bdf7f40073b5b3ed99e1685d90cb1fffeeb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/configure.in b/configure.in
index 12a37668a9404a90c96a2ed2780799a52e656024..e71df0564c40225627500968d67b29cfeeecd322 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -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

diff --git a/src/frontends/gnome/ChangeLog b/src/frontends/gnome/ChangeLog
index c115f1cbba2d256973cf0035a80f9303931c455a..10fd6b6d2e7930a72c52237d46ab2cdceb169dc7 100644 (file)
--- a/src/frontends/gnome/ChangeLog
+++ b/src/frontends/gnome/ChangeLog
@@ -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.

diff --git a/src/frontends/gnome/Timeout_pimpl.C b/src/frontends/gnome/Timeout_pimpl.C
index 808976e5d9d720ba6f852050a11ef664e9c20aee..97dba44e765eb72c548c740b20bee73a9c83d676 100644 (file)
--- a/src/frontends/gnome/Timeout_pimpl.C
+++ b/src/frontends/gnome/Timeout_pimpl.C
@@ -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;
 }
 
 

diff --git a/src/frontends/gnome/Timeout_pimpl.h b/src/frontends/gnome/Timeout_pimpl.h
index f5bfd0a09c9dcc9e5e131da77615e3aaf28c205a..edd9a69001080f27b95d0fef41e99e1dcb622272 100644 (file)
--- a/src/frontends/gnome/Timeout_pimpl.h
+++ b/src/frontends/gnome/Timeout_pimpl.h
@@ -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