summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbrecht Schlosser <albrechts.fltk@online.de>2017-07-07 18:28:10 +0000
committerAlbrecht Schlosser <albrechts.fltk@online.de>2017-07-07 18:28:10 +0000
commit27d77364755328874e22bc47b91cc5ef9887e2fe (patch)
tree7b0409ee73e2d8192bdc625255a5b5e4abd9957a
parentbec74afb391fa4689ed01e1966e1fc007a5dd057 (diff)
Fix some typos.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12301 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--README.CMake.txt12
-rw-r--r--src/Fl_File_Chooser2.cxx2
-rw-r--r--src/Fl_Preferences.cxx2
3 files changed, 8 insertions, 8 deletions
diff --git a/README.CMake.txt b/README.CMake.txt
index 046398f08..bd418f0df 100644
--- a/README.CMake.txt
+++ b/README.CMake.txt
@@ -293,7 +293,7 @@ installed CMake you may need to adjust the path's in the alias commands.
Building with CMake under Xcode requires the CMake generator
with the -G command line switch. This step need to be done only once. If any
-of the cmake related files are updated, Xcode wil rerun cmake for you.
+of the cmake related files are updated, Xcode will rerun cmake for you.
1) Open the MacOS Terminal
@@ -309,7 +309,7 @@ of the cmake related files are updated, Xcode wil rerun cmake for you.
> mkdir Xcode
> cd Xcode
-5) Let CMake create the require IDE files
+5) Let CMake create the required IDE files
> cmake -G Xcode ../..
This step should end in the message:
-- Build files have been written to: .../dev/fltk-1.4.x/build/Xcode
@@ -324,16 +324,16 @@ of the cmake related files are updated, Xcode wil rerun cmake for you.
-D OPTION_USE_SYSTEM_LIBPNG=Off \
../..
-6) Launch Xcode for the Finder or from the Terminal:
+6) Launch Xcode from the Finder or from the Terminal:
> open ./FLTK.xcodeproj
- When Xcode starts, it ask if it should "Autocreate Shemes". Click on
+ When Xcode starts, it asks if it should "Autocreate Schemes". Click on
"Automatically Create Schemes" to confirm.
7) To build and test FLTK, select the scheme "ALL_BUILD" and hit Cmd-B to
build. Then select the scheme "demo" and hit Cmd-R to run the FLTK Demo.
-8) The interactive user interface tool "Fluid" will be loacted in
- build/Xcode/bin/Debug. The example apps are in .../bin/examples/debug.
+8) The interactive user interface tool "Fluid" will be located in
+ build/Xcode/bin/Debug. The example apps are in .../bin/examples/Debug.
Static libraries are in .../lib/Debug/
9) The "install" Scheme currently fails because it is run with user permission.
diff --git a/src/Fl_File_Chooser2.cxx b/src/Fl_File_Chooser2.cxx
index 71c51f8ac..791a97c19 100644
--- a/src/Fl_File_Chooser2.cxx
+++ b/src/Fl_File_Chooser2.cxx
@@ -1264,7 +1264,7 @@ Fl_File_Chooser::update_preview()
newlabel = "@-3refresh"; // a cross
set = 1;
} else if (s.st_size==0) {
- // this file is emty
+ // this file is empty
newlabel = "<empty file>";
set = 1;
} else {
diff --git a/src/Fl_Preferences.cxx b/src/Fl_Preferences.cxx
index 7491b8224..77683c597 100644
--- a/src/Fl_Preferences.cxx
+++ b/src/Fl_Preferences.cxx
@@ -965,7 +965,7 @@ char Fl_Preferences::RootNode::getPath( char *path, int pathlen ) {
if ( (ext==0L) || (ext<name) ) {
if (strlen(name)==0) {
- // emty filenames will create a path with "data/" as a driectory name
+ // empty filenames will create a path with "data/" as a directory name
strlcat( path, "data", pathlen );
} else {
// filenames without extension will create a path with a ".data" extension