diff options
| -rw-r--r-- | FL/Fl_Text_Display.H | 14 | ||||
| -rw-r--r-- | configure.in | 6 |
2 files changed, 15 insertions, 5 deletions
diff --git a/FL/Fl_Text_Display.H b/FL/Fl_Text_Display.H index 02b638f89..754cc10cb 100644 --- a/FL/Fl_Text_Display.H +++ b/FL/Fl_Text_Display.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Text_Display.H,v 1.4.2.6 2002/05/21 11:14:57 easysw Exp $" +// "$Id: Fl_Text_Display.H,v 1.4.2.7 2002/06/08 12:51:38 easysw Exp $" // // Header file for Fl_Text_Display class. // @@ -219,10 +219,20 @@ class Fl_Text_Display: public Fl_Group { uchar textfont_; uchar textsize_; unsigned textcolor_; + + // The following are not presently used from the original NEdit + // code, but are being put here so that future versions of + // Fl_Text_Display can implement wrapping and line numbers + // without breaking binary compatibility. + int mLineNumLeft, mLineNumWidth; + /* Line number margin and width */ + int mContinuousWrap; /* Wrap long lines when displaying */ + int mWrapMargin; /* Margin in # of char positions for + wrapping in continuousWrap mode */ }; #endif // -// End of "$Id: Fl_Text_Display.H,v 1.4.2.6 2002/05/21 11:14:57 easysw Exp $". +// End of "$Id: Fl_Text_Display.H,v 1.4.2.7 2002/06/08 12:51:38 easysw Exp $". // diff --git a/configure.in b/configure.in index f93421002..8e7b05c2d 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ dnl -*- sh -*- dnl the "configure" script is made from this by running GNU "autoconf" dnl -dnl "$Id: configure.in,v 1.33.2.31.2.70 2002/06/07 20:15:17 easysw Exp $" +dnl "$Id: configure.in,v 1.33.2.31.2.71 2002/06/08 12:51:38 easysw Exp $" dnl dnl Configuration script for the Fast Light Tool Kit (FLTK). dnl @@ -445,7 +445,7 @@ case $uname in fi ) - if test x$ac_cv_lib_GL_glXMakeCurrent = xno -a x$ac_cv_lib_MesaGL_glXMakeCurrent = xno; then + if test x$ac_cv_lib_GL_glXMakeCurrent != xyes -a x$ac_cv_lib_MesaGL_glXMakeCurrent != xyes; then LINKFLTKGL="" GLLIBNAME="" GLDSONAME="" @@ -748,5 +748,5 @@ dnl Make sure the fltk-config script is executable... chmod +x fltk-config dnl -dnl End of "$Id: configure.in,v 1.33.2.31.2.70 2002/06/07 20:15:17 easysw Exp $". +dnl End of "$Id: configure.in,v 1.33.2.31.2.71 2002/06/08 12:51:38 easysw Exp $". dnl |