Author: matt
Date: 2010-03-06 06:24:43 -0800 (Sat, 06 Mar 2010)
New Revision: 7223
Log:
Updated typos in 123 readme
Modified:
branches/branch-1.3/README
branches/branch-1.3/README.123
Modified: branches/branch-1.3/README
===================================================================
--- branches/branch-1.3/README 2010-03-05 21:18:18 UTC (rev 7222)
+++ branches/branch-1.3/README 2010-03-06 14:24:43 UTC (rev 7223)
@@ -54,21 +54,21 @@
You can run configure yourself to get the exact setup you
need. Type "./configure <options>". Options include:
- --enable-cygwin - Enable the Cygwin libraries (WIN32)
- --enable-debug - Enable debugging code & symbols
- --disable-gl - Disable OpenGL support
- --enable-shared - Enable generation of shared libraries
- --enable-threads - Enable multithreading support
- --enable-xdbe - Enable the X double-buffer extension
- --enable-xft - Enable the Xft library (anti-aliased fonts)
+--enable-cygwin - Enable the Cygwin libraries (WIN32)
+--enable-debug - Enable debugging code & symbols
+--disable-gl - Disable OpenGL support
+--enable-shared - Enable generation of shared libraries
+--enable-threads - Enable multithreading support
+--enable-xdbe - Enable the X double-buffer extension
+--enable-xft - Enable the Xft library (anti-aliased fonts)
- --bindir=/path - Set the location for executables
+--bindir=/path - Set the location for executables
[default = /usr/local/bin]
- --libdir=/path - Set the location for libraries
+--libdir=/path - Set the location for libraries
[default = /usr/local/lib]
- --includedir=/path - Set the location for include files.
+--includedir=/path - Set the location for include files.
[default = /usr/local/include]
- --prefix=/dir - Set the directory prefix for files
+--prefix=/dir - Set the directory prefix for files
[default = /usr/local]
When the configure script is done you can just run the
@@ -98,8 +98,8 @@
makeinclude and config files to the main directory and do a
make:
- copy makefiles\Makefile.<env> Makefile
- make
+copy makefiles\Makefile.<env> Makefile
+make
BUILDING FLTK UNDER OS/2
@@ -113,25 +113,25 @@
directory and do a make:
copy makefiles\Makefile.os2x Makefile
- make
+make
INTERNET RESOURCES
FLTK is available on the 'net in a bunch of locations:
- - WWW: http://www.fltk.org/
- http://www.fltk.org/str.php [for reporting bugs]
- http://www.fltk.org/software.php [source code]
+- WWW: http://www.fltk.org/
+ http://www.fltk.org/str.php [for reporting bugs]
+ http://www.fltk.org/software.php [source code]
- - FTP: http://ftp.easysw.com/pub/fltk
- ftp://ftp.easysw.com/pub/fltk
- ftp://ftp2.easysw.com/pub/fltk
- ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk
-
ftp://linux.mathematik.tu-darmstadt.de/pub/linux/mirrors/misc/fltk
- ftp://gd.tuwien.ac.at/hci/fltk
+- FTP: http://ftp.easysw.com/pub/fltk
+ ftp://ftp.easysw.com/pub/fltk
+ ftp://ftp2.easysw.com/pub/fltk
+ ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk
+ ftp://linux.mathematik.tu-darmstadt.de/pub/linux/mirrors/misc/fltk
+ ftp://gd.tuwien.ac.at/hci/fltk
- - EMail: [email protected] [see instructions below]
+- EMail: [email protected] [see instructions below]
To send a message to the FLTK mailing list ("[email protected]")
you must first join the list. Non-member submissions are
@@ -158,7 +158,7 @@
Corporation. UNIX is a registered trademark of the X/Open
Group, Inc. OpenGL is a registered trademark of Silicon
Graphics, Inc. MacOS is a registered trademark of Apple
- Computers, Inc.
+ Computers, Inc.
COPYRIGHT
Modified: branches/branch-1.3/README.123
===================================================================
--- branches/branch-1.3/README.123 2010-03-05 21:18:18 UTC (rev 7222)
+++ branches/branch-1.3/README.123 2010-03-06 14:24:43 UTC (rev 7223)
@@ -4,20 +4,20 @@
This file listst the differences between FLTK 1 and FLTK 2 with annotations
for a possible implementation of FLTK 3. The all new and improved FLTK 3
-needs to be compatible with 1 and 2. It must have a moder API, plenty of
+needs to be compatible with 1 and 2. It must have a modern API, a complete set
of
widgets, lots of options, customization at run-time, but still be easily
-portable, fast, and of course light.
+portable, fast, and, of course, light.
-FLTK 1 has become a nice starting point for the first steps in GUI
-programming. It runs on al major platform (and on many minor ones
+FLTK 1 has evolved to be a great starting point for the first steps in GUI
+programming. It runs on all major platform (and on many minor ones
as well), is small, compact, and easy to use. FLTK 2 was the
-attempt to continue the success of FLTK 1 with a much cleaber API
+attempt to continue the success of FLTK 1 with a clearer and more modern API
and many important details improved. Unfortunately many users never
made the jump to FLTK 2 and so it not only ended in a crawling slow
branch, it also became instable and at last unmaintainable.
FLTK 3 sets out to surprise FLTK 1 users and satisfy FLTK 2 junkies.
-It will basically be the improved FLTK 2 API combined with the quite
+It will basically be the improved FLTK 2 API combined with the proven and
stable innards of FLTK 1. As an extra bonus, FLTK 3 will be compatible
to 1 and 2. Just prepend your code with the "coding_style" instruction
and FLTK 3 will do the rest. It is even possible to intermix F1 and
@@ -34,7 +34,7 @@
This chapter outlines the biggest differences between version.
(1) Coordinate System: FLTK 1 child coordinates are always relative to the
-window, not as most would expect to the parent. FLTK 2 does the logical
+window, not as most would expect to the parent group. FLTK 2 does the logical
thing and uses group-relative origins. This is somewhat difficult to port
if we want to stay downward compatible. Fl_Widget will need an additional
flag indicating absolute or relative coordinates.
@@ -42,10 +42,10 @@
(2) Pulldown Menus: The developers of the Forms Library did not implement
the idea of hierarchies all the way through. Pulldown menus, which are
hierarchical by nature, were instead implemented as a list with lots of
-tricks and cludges to make them usable. FLTK 2 went half way by using the
+tricks and kludges to make them usable. FLTK 2 went half way by using the
existing Windget/Group relation to create menus, however, menu items are
still specialized widgets. For FLTK 3, I would like to allow any widget
-inside a pulldown menu.
+inside a pulldown menu, using the hierarchical nature of the FLTK base class
Fl_Widget.
(3) Browsers and Tree Views: Browsers in FLTK1 are implemented even worse
than Pulldown Menus. FLTK 2 solved the issues in a similar way, and here
@@ -53,21 +53,22 @@
functionality to allow arbitrary widgets as list items. A Tree-like
widget comes free with the FLTK 2 concept. FLTK 1 has no such thing and
even Fluid had to hack the library badly to generate a tree view.
+FLTK 1.3 now comes with Greg's Fl_Tree widget.
(4) Namespaces: this is a minr issue that I include for completeness. FLTK 2
-introduces the ftk namespace, renaming all widgets. FLTK 3 will use the
+introduces the fltk namespace, renaming all widgets. FLTK 3 will use the
FLTK 2 naming scheme and map FLTK 1 class names using typedefs. This is, as
most things in programming are, a compromise. The "coding_style" function
must be used to switch between FLTK 1 and FLTK 2 code. No worries though,
it's easy and straight forward.
(5) Layout: FLTK 1 uses a top-down approach for widget layout in which the
-parent widget decides about the childs size "resize(x, y, w, h)". In FLTK 2
-any widget can call "layout()" which will query children for their preffered
+parent widget decides about the child's size "resize(x, y, w, h)". In FLTK 2
+any widget can call "layout()" which will query children for their preferred
size and propagate the information up. This is a great concept that FLTK 3
should adapt, plus it is compatible.
-(6) Ractangle: FLTK 2's base class is fltk::Rectangle. This is nice and
+(6) Rectangle: FLTK uses discrete coordinates and sizes. FLTK 2's base class
is fltk::Rectangle. This is nice and
easy to implement. The API is pretty much the same in both versions.
(7) Styles: FLTK 2 uses a minimal number of styles to define the basic
@@ -184,8 +185,9 @@
2: class Dial
*: should map easily
-1:
+1: class Fl_Box
2: class Divider
+*:
1: class Fl_Double_Window
2: class DoubleBufferWindow
@@ -194,7 +196,7 @@
1: class Fl_End
2:
-1:
+1: Fl_Box
2: class EngravedLabel
1: class Fl_File_Browser
@@ -326,8 +328,9 @@
1:
2: class InvisibleBox
-1:
+1: struct Fl_Menu_Item
2: class Item
+*: this will be hard to emulate!
1:
2: class ItemGroup
@@ -365,7 +368,7 @@
1: class Fl_Menu_Window
2: class MenuWindow
-1:
+1: class Fl_Screen?
2: class Monitor
1: class Fl_Multi_Browser
@@ -382,7 +385,7 @@
2: class MultiLineOutput
*: should map easily
-1:
+1: Fl::lock()
2: class Mutex
1: class Fl_Nice_Slider
@@ -408,7 +411,7 @@
1: class Fl_Pack
2: class PackedGroup
-*: should map easily, FLTK 2 has soem additional functionaity
+*: should map easily, FLTK 2 has some additional functionaity
1: class Fl_Pixmap
2:
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
