mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix test for OpenGL libraries - not == xno, but != xyes.

Browse Source 
Add some other NEdit text display data that wasn't in the current
implementation (wrap + line number stuff).


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2296 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet 2002-06-08 12:51:38 +00:00
parent fbeb7fc775
commit 5d7f42585b
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
FL/Fl_Text_Display.H
View File

@ -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. // Header file for Fl_Text_Display class.
// //
@ -219,10 +219,20 @@ class Fl_Text_Display: public Fl_Group {
uchar textfont_; uchar textfont_;
uchar textsize_; uchar textsize_;
unsigned textcolor_; 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 #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 $".
// //

6
configure.in
View File

@ -1,7 +1,7 @@
dnl -*- sh -*- dnl -*- sh -*-
dnl the "configure" script is made from this by running GNU "autoconf" dnl the "configure" script is made from this by running GNU "autoconf"
dnl 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
dnl Configuration script for the Fast Light Tool Kit (FLTK). dnl Configuration script for the Fast Light Tool Kit (FLTK).
dnl dnl
@ -445,7 +445,7 @@ case $uname in
fi 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="" LINKFLTKGL=""
GLLIBNAME="" GLLIBNAME=""
GLDSONAME="" GLDSONAME=""
@ -748,5 +748,5 @@ dnl Make sure the fltk-config script is executable...
chmod +x fltk-config chmod +x fltk-config
dnl 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 dnl