summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbrecht Schlosser <albrechts.fltk@online.de>2018-12-09 17:52:55 +0100
committerAlbrecht Schlosser <albrechts.fltk@online.de>2018-12-10 15:00:45 +0100
commit810b91471761e3d1736ed79de06b4c8a69125b30 (patch)
treea06d532a99687cae43ddbdff13d4947fe940f4ee
parent6c876189d8a8b4b4cad9832c20055b89b56786ad (diff)
Update examples: minor changes, rename, update .gitignore
.gitignore, Makefile: add missing files, sort example filenames. Makefile.FLTK: update and extend FLTKCONFIG definition examples. Rename README.examples to README.txt (easier for Windows users). README.txt: minor edits, fix link, remove trailing whitespace.
-rw-r--r--.gitignore3
-rw-r--r--examples/Makefile8
-rw-r--r--examples/Makefile.FLTK3
-rw-r--r--examples/README.txt (renamed from examples/README.examples)27
4 files changed, 22 insertions, 19 deletions
diff --git a/.gitignore b/.gitignore
index 80544a61d..36bb00266 100644
--- a/.gitignore
+++ b/.gitignore
@@ -78,8 +78,8 @@
/examples/howto-simple-svg
/examples/howto-text-over-image-button
/examples/menubar-add
-/examples/nativefilechooser-simple-app
/examples/nativefilechooser-simple
+/examples/nativefilechooser-simple-app
/examples/OpenGL3-glut-test
/examples/OpenGL3test
/examples/progress-simple
@@ -95,6 +95,7 @@
/examples/tabs-simple
/examples/textdisplay-with-colors
/examples/texteditor-simple
+/examples/texteditor-with-dynamic-colors
/examples/tree-as-container
/examples/tree-custom-draw-items
/examples/tree-custom-sort
diff --git a/examples/Makefile b/examples/Makefile
index 08c511590..a07c265fe 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -16,10 +16,12 @@ ALL = clipboard$(EXEEXT) \
howto-simple-svg$(EXEEXT) \
howto-text-over-image-button$(EXEEXT) \
menubar-add$(EXEEXT) \
- nativefilechooser-simple$(EXEEXT) \
nativefilechooser-simple-app$(EXEEXT) \
+ nativefilechooser-simple$(EXEEXT) \
progress-simple$(EXEEXT) \
shapedwindow$(EXEEXT) \
+ simple-terminal$(EXEEXT) \
+ SVG_File_Surface$(EXEEXT) \
table-as-container$(EXEEXT) \
table-simple$(EXEEXT) \
table-sort$(EXEEXT) \
@@ -27,16 +29,14 @@ ALL = clipboard$(EXEEXT) \
table-spreadsheet-with-keyboard-nav$(EXEEXT) \
table-with-keynav$(EXEEXT) \
tabs-simple$(EXEEXT) \
- simple-terminal$(EXEEXT) \
- SVG_File_Surface$(EXEEXT) \
textdisplay-with-colors$(EXEEXT) \
texteditor-simple$(EXEEXT) \
texteditor-with-dynamic-colors$(EXEEXT) \
- tree-simple$(EXEEXT) \
tree-as-container$(EXEEXT) \
tree-custom-draw-items$(EXEEXT) \
tree-custom-sort$(EXEEXT) \
tree-of-tables$(EXEEXT) \
+ tree-simple$(EXEEXT) \
wizard-simple$(EXEEXT)
# default target -- build everything
diff --git a/examples/Makefile.FLTK b/examples/Makefile.FLTK
index 5fe833657..52b72993a 100644
--- a/examples/Makefile.FLTK
+++ b/examples/Makefile.FLTK
@@ -6,7 +6,8 @@
# on your system. Common examples:
#
# FLTKCONFIG = /usr/local/bin/fltk-config
-# FLTKCONFIG = /usr/local/src/fltk-1.3.x-svn/fltk-config
+# FLTKCONFIG = /usr/local/src/fltk-1.4.x/fltk-config
+# FLTKCONFIG = ../build/fltk-config # if ../build == CMake build directory
#
# Set .SILENT in your Makefile if you want 'quieter' builds.
#
diff --git a/examples/README.examples b/examples/README.txt
index 6889eaad3..d1a53821d 100644
--- a/examples/README.examples
+++ b/examples/README.txt
@@ -6,7 +6,7 @@ FLTK EXAMPLE PROGRAMS
programmers. The "*-simple.cxx" files are a good starting point for
those new to FLTK.
- The programs in this directory are NOT built automatically
+ The programs in this directory are NOT built automatically
when you build FLTK; you have to manually build them.
The goals of these example programs:
@@ -15,7 +15,7 @@ FLTK EXAMPLE PROGRAMS
o Show simple examples of how to use widgets to new users of FLTK.
- o Show intermediate or advanced examples of techniques often
+ o Show intermediate or advanced examples of techniques often
misused or hard to document
o Demonstrate code that are FAQs on the newsgroup forum.
@@ -40,12 +40,12 @@ NEW SUBMISSIONS: RECOMMENDED PRACTICES
just a .cxx/.h file pair should have their own subdirectory.
Data files common to several examples should be located in the
- examples/data directory.
-
- Ancillary data files should be as small as possible, to keep the
+ examples/data directory.
+
+ Ancillary data files should be as small as possible, to keep the
distribution tar files small. Avoid high resolution images or
- uncompressed images when possible.
-
+ uncompressed images when possible.
+
Examples that need large data sets (HD images, etc) should not
be part of the FLTK distribution; they can be provided as separate
packages (eg. as articles or external links).
@@ -72,16 +72,17 @@ NAMING CONVENTIONS
with that widget's name in lowercase, eg. "table.cxx" for Fl_Table.
Demonstrations of a particular technique should start with
- "howto-xxx.cxx" to avoid naming conflicts with future widgets
+ "howto-xxx.cxx" to avoid naming conflicts with future widgets
of the same name.
xxx-simple.cxx -- Simplest possible example of widget xxx
- eg. table-simple.cxx
+ eg. "table-simple.cxx"
xxx-<technique>.cxx -- A particular "technique" using widget xxx
eg. "table-spreadsheet.cxx"
- howto-<technique>.cxx -- Demonstrate a particular technique, eg. "howto-threading.cxx"
+ howto-<technique>.cxx -- Demonstrate a particular technique,
+ eg. "howto-threading.cxx"
Some example programs may depend on multiple files. To avoid
cluttering up the top level examples directory, such examples will
@@ -106,7 +107,7 @@ HISTORY
applications programmers.
The fltk/examples directory was created in FLTK 1.3.0 to separate
- 'good programming examples' from the test suite code.
+ 'good programming examples' from the test suite code.
DISCLAIMER
@@ -114,9 +115,9 @@ DISCLAIMER
The examples in this directory are provided 'as-is', without any express
or implied warranty. In no event will the authors be held liable for
any damages arising from the use of this software.
-
+
BUGS
If you find a bug, please report it through the fltk STR form at
- http://fltk.org/str.php
+ https://www.fltk.org/str.php