removed some dead code from BufferView, added a check for kpsewhich in configure...

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

diff --git a/ChangeLog b/ChangeLog
index 521514f3bd1660b141ba2be4d9c9c22012250f0c..8028a9833d968a840ee55f0f728300c8a86f8fd6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+1999-10-05  Lars Gullik Bjønnes  <larsbj@lyx.org>
+
+       * configure.in (Check for programs): Added a check for kpsewhich,
+       the latex generation will use this later to better the dicovery of
+       all used files. 
+
+       * src/BufferView.C (create_view): we don't need to cast this to
+       (void*) that is done automatically.
+       (WorkAreaButtonPress): removed some dead code.
+
 1999-10-05  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
        * src/minibuffer.C (Init): make sure that the "Welcome to LyX!"

diff --git a/acconfig.h b/acconfig.h
index 0dce1c82e404080dbd118277f238ea998da5a641..ddbcbac77a6be97991a74bbb10fca501a84e25bf 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -76,7 +76,6 @@
   e.g. <xpm.h> */
 #undef XPM_H_LOCATION
 
-
 @BOTTOM@ 
 
 /************************************************************ 

diff --git a/configure.in b/configure.in
index e2d181bf7a19a133c1d8004022bf42cdd60a336e..695755b180d700536bded658d01175eec43af553 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -33,6 +33,11 @@ done
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 AC_PROG_RANLIB
+AC_CHECK_PROG(KPSEWHICH, kpsewhich, kpsewhich, :)
+if test "x$KPSEWHICH" = xkpsewhich ; then
+    AC_DEFINE(HAVE_KPSEWHICH, 1,
+    [Define this if you have the kpsewhich program working on your system.])
+fi
 
 ### we will also need a C compiler to compile GNU gettext
 AC_PROG_CC

diff --git a/src/BufferView.C b/src/BufferView.C
index 212a1831bb014cc3524daf5c438b3570a7986f9c..43761f4c4d04503240601be89db00896f0d5dfa5 100644 (file)
--- a/src/BufferView.C
+++ b/src/BufferView.C
@@ -394,7 +394,7 @@ void BufferView::create_view(int xpos, int ypos, int width, int height)
                                      height-2*bw,"",
                                      work_area_handler);
        obj->wantkey = FL_KEY_TAB;
-       obj->u_vdata = (void*) this; /* This is how we pass the BufferView
+       obj->u_vdata = this; /* This is how we pass the BufferView
                                       to the work_area_handler. */
        fl_set_object_boxtype(obj,FL_DOWN_BOX);
        fl_set_object_resize(obj, FL_RESIZE_ALL);
@@ -469,7 +469,7 @@ void BufferView::create_view(int xpos, int ypos, int width, int height)
        timer_cursor = obj = fl_add_timer(FL_HIDDEN_TIMER,
                                          0,0,0,0,"Timer");
        fl_set_object_callback(obj,CursorToggleCB,0);
-       obj->u_vdata = (void*) this;
+       obj->u_vdata = this;
 }
 
 
@@ -893,18 +893,6 @@ int BufferView::WorkAreaButtonPress(FL_OBJECT *ob, Window,
                
                // Hit above or below the table?
                if (doit) {
-#if 0
-                       long y_tmp = y + screen->first;
-
-                       Row*  row =  _buffer->text->GetRowNearY(y_tmp);
-
-                       // Isn't this empty code anyway? (Lgb)
-                       if (row->par != _buffer->text->cursor.par)
-                               doit = true;
-               }
-               
-               if (doit) {
-#endif
                        if (!_buffer->text->selection) {
                                screen->ToggleSelection();
                                _buffer->text->ClearSelection();
@@ -954,18 +942,6 @@ int BufferView::WorkAreaButtonPress(FL_OBJECT *ob, Window,
 
        // Right click on a footnote flag opens float menu
        if (button == 3) { 
-#if 0
-               // Isn't this empty code anyway? (Lgb)
-               if (_buffer->text->cursor.par->footnoteflag == 
-                   LyXParagraph::OPEN_FOOTNOTE) {
-                       selection_possible = false;
-                       lyxerr.debug("LyX: Sorry not implemented yet.");
-                       return 0;
-               }
-       }
-       
-       if (button == 3) {
-#endif
                selection_possible = false;
                return 0;
        }
@@ -1525,4 +1501,3 @@ void BufferView::restorePosition()
        currentBuffer()->text->SetCursorFromCoordinates(x, y);
        currentBuffer()->update(0);
 } 
-