Fixed typos and reformatted some lines that were longer than 80 characters.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7947 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Albrecht Schlosser 2010-12-04 12:03:08 +00:00
parent 0861422c71
commit 2db2db587c
2 changed files with 49 additions and 44 deletions

View File

@ -56,13 +56,13 @@ CAUTION: Libraries built by any of these environments can not be mixed!
--------------- ---------------
In order to build FLTK from the command line, you need to install the MinGW In order to build FLTK from the command line, you need to install the MinGW
environment from www,mingw.org. The graphical installer " mingw-get-inst" can be environment from www.mingw.org. The graphical installer "mingw-get-inst" can
downloaded here for free: be downloaded here for free:
http://www.mingw.org/wiki/Getting_Started http://www.mingw.org/wiki/Getting_Started
Launch the installer and follow the instructions. In the "Select Components" Launch the installer and follow the instructions. In the "Select Components"
dialog, add "C++ Compiler", "MSYS Basic System", and "MinGW Develoepr Toolkit". dialog, add "C++ Compiler", "MSYS Basic System", and "MinGW Developer Toolkit".
Wait for the installer to finish. Wait for the installer to finish.
After downloading and installing, you need to launch the MinGW Shell through After downloading and installing, you need to launch the MinGW Shell through
@ -76,14 +76,15 @@ Download FLTK from here:
http://www.fltk.org/software.php http://www.fltk.org/software.php
into your home folder. The default location as seen from MSWindows is similar to into your home folder. The default location as seen from MSWindows is similar
to
C:\MinGW\msys\1.0\home\matt\ C:\MinGW\msys\1.0\home\matt\
If you are familiar with "subversion" and like to stay current with you version, If you are familiar with "subversion" and like to stay current with your
you will find the subversion access parameters at the bottom of that page. version, you will find the subversion access parameters at the bottom of
Unpack FLTK into a convinient location. I like to have everything in my dev that page. Unpack FLTK into a convenient location. I like to have everything
directory: in my dev directory:
cd cd
mkdir dev mkdir dev
@ -104,7 +105,7 @@ Now configure your FLTK installation:
./configure ./configure
ADVANCED: type "./configure --help" to get a complete list of optional ADVANCED: type "./configure --help" to get a complete list of optional
configurations parameters. These should be pretty self-explenatory. Some configuration parameters. These should be pretty self-explanatory. Some
more details can be found in README. more details can be found in README.
:END_ADVANCED :END_ADVANCED
@ -127,13 +128,14 @@ Now this is easy. Stay in your FLTK source-code directory and type:
make make
The entire FLTK toolkit including many test programs will be built for you. No The entire FLTK toolkit including many test programs will be built for you.
warnings should appear. No warnings should appear.
(actually, as of Oct 25 2010, quite a lot of warnings related to suggested (actually, as of Oct 25 2010, quite a lot of warnings related to suggested
parentheses and others will appear, this is normal and will be fixed. The linker parentheses and others will appear, this is normal and will be fixed. The
will also spit out a lbunch of warnings for every program linked. This needs to linker will also spit out a bunch of warnings for every program linked. This
be fixed. Lastly, there is no generator for man pages in MinGW) needs to be fixed. Lastly, there is no generator for man pages in a default
MinGW installation, but you can install man and groff to fix this.)
Testing FLTK Testing FLTK
@ -147,8 +149,8 @@ After a successful build, you can test FLTK's capabilities:
Installing FLTK Installing FLTK
----------------- -----------------
If you did not change any of the configuration settings, FLTK will be installed If you did not change any of the configuration settings, FLTK will be
in "/usr/local/include" and "/usr/local/lib" by typing installed in "/usr/local/include" and "/usr/local/lib" by typing
make install make install
@ -163,13 +165,13 @@ to the "./configure" command.
FLTK provides a neat script named "fltk-config" that can provide all the flags FLTK provides a neat script named "fltk-config" that can provide all the flags
needed to build FLTK applications using the same flags that were used to build needed to build FLTK applications using the same flags that were used to build
the library itself. Running "fltk-config" without arguments will print a list the library itself. Running "fltk-config" without arguments will print a list
options. The easiest call to compile an FLTK application from a single source of options. The easiest call to compile an FLTK application from a single
file is: source file is:
fltk-config --compile myProgram.cxx fltk-config --compile myProgram.cxx
"fltk-config" and "fluid" will be installed in "/usr/local/bin/" by default. I "fltk-config" and "fluid" will be installed in "/usr/local/bin/" by default.
recommend that you add it to the command search path. I recommend that you add it to the command search path.
@ -197,12 +199,13 @@ Download FLTK from here:
http://www.fltk.org/software.php http://www.fltk.org/software.php
If you are familiar with "subversion" and like to stay current with you version, If you are familiar with "subversion" and like to stay current with your
you will find the subversion access parameters at the bottom of that page. version, you will find the subversion access parameters at the bottom of
that page.
Unpack FLTK by using an appropriate unpacker and copy the new folder into a Unpack FLTK by using an appropriate unpacker and copy the new folder into a
convenient location. I have set up a "dev" folder in my home folder for all my convenient location. I have set up a "dev" folder in my home folder for all
projects. my projects.
Configuring FLTK Configuring FLTK
@ -233,8 +236,8 @@ clear unresolved reference errors.
Testing FLTK Testing FLTK
-------------- --------------
Select "Start Debugging" form the "Debug" menu or just press F5 to run the Demo Select "Start Debugging" from the "Debug" menu or just press F5 to run the
program. Use "Demo" to explore all test programs. Demo program. Use "Demo" to explore all test programs.
Installing FLTK Installing FLTK
@ -249,12 +252,12 @@ respective subdirectories, so that they are available for future development
without adding link and include paths to the solution. without adding link and include paths to the solution.
copy the entire FL directory into the include path copy the entire FL directory into the include path
copy all .lib files from the fltk lib directory to the VC lib directory copy all .lib files from the fltk lib directory to the VC lib directory
copy fluid.exe in the fluid directory to the bin directory copy fluid.exe in the fluid directory to the bin directory
I highly discourace using dll's (dynamically linking libraries) on MSWindows I highly discourage using dll's (dynamically linking libraries) on MSWindows
because they will require an installation process and likely cause version because they will require an installation process and likely cause version
conflicts. Use the static .lib libraries instead. conflicts. Use the static .lib libraries instead.
@ -277,7 +280,7 @@ Properties > C/C++ > Preprocessor > Preprocessor Definitions).
Compile and run your test program with F5. Compile and run your test program with F5.
You can also include .fl resources: add a new Hedare file to you project, but You can also include .fl resources: add a new Header file to your project, but
let the name end in .fl. Right-click and select "Open with...". Add "fluid.exe" let the name end in .fl. Right-click and select "Open with...". Add "fluid.exe"
from the "bin" directory and set it as the default editor. from the "bin" directory and set it as the default editor.
@ -314,12 +317,13 @@ Download FLTK from here:
http://www.fltk.org/software.php http://www.fltk.org/software.php
If you are familiar with "subversion" and like to stay current with you version, If you are familiar with "subversion" and like to stay current with your
you will find the subversion access parameters at the bottom of that page. version, you will find the subversion access parameters at the bottom of
that page.
Unpack FLTK by using an appropriate unpacker and copy the new folder into a Unpack FLTK by using an appropriate unpacker and copy the new folder into a
convenient location. I have set up a "dev" folder in my home folder for all my convenient location. I have set up a "dev" folder in my home folder for all
projects. my projects.
Configuring FLTK Configuring FLTK
@ -343,8 +347,8 @@ libraries.
Testing FLTK Testing FLTK
-------------- --------------
Select "Start Debugging" form the "Debug" menu or just press F5 to run the Demo Select "Start Debugging" from the "Debug" menu or just press F5 to run the
program. Use "Demo" to explore all test programs. Demo program. Use "Demo" to explore all test programs.
Installing FLTK Installing FLTK
@ -359,12 +363,12 @@ respective subdirectories, so that they are available for future development
without adding link and include paths to the solution. without adding link and include paths to the solution.
copy the entire FL directory into the include path copy the entire FL directory into the include path
copy all .lib files from the fltk lib directory to the VC lib directory copy all .lib files from the fltk lib directory to the VC lib directory
copy fluid.exe in the fluid directory to the bin directory copy fluid.exe in the fluid directory to the bin directory
I highly discourace using dll's (dynamically linking libraries) on MSWindows I highly discourage using dll's (dynamically linking libraries) on MSWindows
because they will require an installation process and likely cause version because they will require an installation process and likely cause version
conflicts. Use the static .lib libraries instead. conflicts. Use the static .lib libraries instead.
@ -387,11 +391,11 @@ Properties > C/C++ > Preprocessor > Preprocessor Definitions).
Compile and run your test program with F5. Compile and run your test program with F5.
You can also include .fl resources: add a new Hedare file to you project, but You can also include .fl resources: add a new Header file to your project, but
let the name end in .fl. Right-click and select "Open with...". Add "fluid.exe" let the name end in .fl. Right-click and select "Open with...". Add "fluid.exe"
from the "bin" directory and set it as the default editor. from the "bin" directory and set it as the default editor.
To automatically compile .fl files, open the Properties editor and cahnge the To automatically compile .fl files, open the Properties editor and change the
Element Type to Custom Build and click Apply. Now set the Element Type to Custom Build and click Apply. Now set the
Custom Build Steps to: Custom Build Steps to:

View File

@ -775,7 +775,8 @@ Fl_Window* new_view() {
w->editor = new Fl_Text_Editor(0, 30, 660, 370); w->editor = new Fl_Text_Editor(0, 30, 660, 370);
w->editor->textfont(FL_COURIER); w->editor->textfont(FL_COURIER);
w->editor->textsize(TS); w->editor->textsize(TS);
//w->editor->wrap_mode(Fl_Text_Editor::WRAP_AT_BOUNDS, 250); //
w->editor->wrap_mode(Fl_Text_Editor::WRAP_AT_BOUNDS, 250);
w->editor->buffer(textbuf); w->editor->buffer(textbuf);
w->editor->highlight_data(stylebuf, styletable, w->editor->highlight_data(stylebuf, styletable,
sizeof(styletable) / sizeof(styletable[0]), sizeof(styletable) / sizeof(styletable[0]),