summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbrecht Schlosser <albrechts.fltk@online.de>2016-04-09 10:42:17 +0000
committerAlbrecht Schlosser <albrechts.fltk@online.de>2016-04-09 10:42:17 +0000
commitd56e2ec9f05d97c3c8834404b32f51201c2b688e (patch)
treee0bc5d3b6c20bc2e79d0dff8432192d6327740ef
parent72ced0ddd3f02548e978b51891d155eff1245a4e (diff)
Fix typos.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11560 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--FL/Fl.H10
-rw-r--r--FL/Fl_System_Driver.H2
-rw-r--r--FL/Fl_Window.H2
-rw-r--r--FL/fl_utf8.h2
-rw-r--r--src/Fl_Text_Buffer.cxx4
-rw-r--r--src/Fl_x.cxx4
-rw-r--r--src/drivers/Darwin/Fl_Darwin_System_Driver.cxx2
-rw-r--r--src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx2
-rw-r--r--src/drivers/PicoAndroid/Fl_PicoAndroid_Graphics_Driver.cxx2
-rw-r--r--src/drivers/PicoSDL/Fl_PicoSDL_Graphics_Driver.cxx2
-rw-r--r--src/drivers/Posix/Fl_Posix_System_Driver.cxx2
-rw-r--r--src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx2
-rw-r--r--src/drivers/Xlib/Fl_Xlib_Graphics_Driver.cxx2
-rw-r--r--src/xutf8/utf8Input.c2
-rw-r--r--src/xutf8/utf8Utils.c4
15 files changed, 22 insertions, 22 deletions
diff --git a/FL/Fl.H b/FL/Fl.H
index 949cf430a..563d81383 100644
--- a/FL/Fl.H
+++ b/FL/Fl.H
@@ -144,16 +144,16 @@ public: // run time information about compile time configuration
/** @{ */
static bool cfg_gfx_xlib; ///< X11 Xlib rendering available, usually on Linux systems
static bool cfg_gfx_quartz; ///< Quartz rendering available, usually on OS X systems
- static bool cfg_gfx_gdi; ///< GDI redering available, usually on MSWindows systems
- static bool cfg_gfx_opengl; ///< OpenGL redering available, available on many platforms
- static bool cfg_gfx_cairo; ///< Cairo redering available, available on many platforms
- static bool cfg_gfx_directx;///< DirectX redering available, usually on MSWindows systems
+ static bool cfg_gfx_gdi; ///< GDI rendering available, usually on MSWindows systems
+ static bool cfg_gfx_opengl; ///< OpenGL rendering available, available on many platforms
+ static bool cfg_gfx_cairo; ///< Cairo rendering available, available on many platforms
+ static bool cfg_gfx_directx;///< DirectX rendering available, usually on MSWindows systems
/** @} */
/** \defgroup cfg_prn runtime printer driver configuration */
/** @{ */
static bool cfg_prn_ps; ///< PostScript rendering available, usually on Linux systems
static bool cfg_prn_quartz; ///< Quartz rendering available, usually on OS X systems
- static bool cfg_prn_gdi; ///< GDI redering available, usually on MSWindows systems
+ static bool cfg_prn_gdi; ///< GDI rendering available, usually on MSWindows systems
/** @} */
/** \defgroup cfg_win runtime window and event manager configuration */
/** @{ */
diff --git a/FL/Fl_System_Driver.H b/FL/Fl_System_Driver.H
index 0fa55cf53..07d2a8b27 100644
--- a/FL/Fl_System_Driver.H
+++ b/FL/Fl_System_Driver.H
@@ -110,7 +110,7 @@ public:
virtual int filename_isdir(const char* n);
// the default implementation of filename_isdir_quick() is in src/filename_isdir.cxx and may be enough
virtual int filename_isdir_quick(const char* n);
- // the default implementation of filename_iext() is in src/filename_ext.cxx and may be enough
+ // the default implementation of filename_ext() is in src/filename_ext.cxx and may be enough
virtual const char *filename_ext(const char *buf);
// whether a platform uses additional code in Fl_Menu::handle(int e)
virtual int need_menu_handle_part2() {return 0;}
diff --git a/FL/Fl_Window.H b/FL/Fl_Window.H
index 3c887232a..da2baf7de 100644
--- a/FL/Fl_Window.H
+++ b/FL/Fl_Window.H
@@ -71,7 +71,7 @@ class FL_EXPORT Fl_Window : public Fl_Group {
friend class Fl_Window_Driver;
friend class Fl_PicoAndroid_Window_Driver;
Fl_X *i; // points at the system-specific stuff, but exists only after the window is mapped
- Fl_Window_Driver *pWindowDriver; // points at the system-specific stuff at window creatino time
+ Fl_Window_Driver *pWindowDriver; // points at the system-specific stuff at window creation time
const char* iconlabel_;
char* xclass_;
diff --git a/FL/fl_utf8.h b/FL/fl_utf8.h
index 5bce88b3a..ca4ac27e9 100644
--- a/FL/fl_utf8.h
+++ b/FL/fl_utf8.h
@@ -104,7 +104,7 @@ FL_EXPORT int fl_utf8test(const char *src, unsigned len);
* for internal use only */
FL_EXPORT int fl_wcwidth_(unsigned int ucs);
-/* XX: return width of utf-8 character string in columns.
+/* XX: return width of UTF-8 character string in columns.
* NOTE: this may also do C1 control character (0x80 to 0x9f) to CP1252 mapping,
* depending on original build options */
FL_EXPORT int fl_wcwidth(const char *src);
diff --git a/src/Fl_Text_Buffer.cxx b/src/Fl_Text_Buffer.cxx
index f57d7bd59..c4a935a81 100644
--- a/src/Fl_Text_Buffer.cxx
+++ b/src/Fl_Text_Buffer.cxx
@@ -1,7 +1,7 @@
//
// "$Id$"
//
-// Copyright 2001-2010 by Bill Spitzak and others.
+// Copyright 2001-2016 by Bill Spitzak and others.
// Original code Copyright Mark Edel. Permission to distribute under
// the LGPL for the FLTK library granted by Mark Edel.
//
@@ -1569,7 +1569,7 @@ static int general_input_filter(char *buffer, int buflen,
if (r == 0) return q - buffer;
p = line;
}
- if (q + 4 /*max width of utf-8 char*/ > buffer + buflen) {
+ if (q + 4 /*max width of UTF-8 char*/ > buffer + buflen) {
memmove(line, p, endline - p);
endline -= (p - line);
return q - buffer;
diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx
index a00edb443..387459f6b 100644
--- a/src/Fl_x.cxx
+++ b/src/Fl_x.cxx
@@ -1384,7 +1384,7 @@ fprintf(stderr,"\n");*/
type = t;
break;
}
- // rest are only used if no utf-8 available:
+ // rest are only used if no UTF-8 available:
if (t == fl_XaText ||
t == fl_XaTextUriList ||
t == fl_XaCompoundText) type = t;
@@ -1625,7 +1625,7 @@ fprintf(stderr,"\n");*/
type = t;
break;
}
- // rest are only used if no utf-8 available:
+ // rest are only used if no UTF-8 available:
if (t == fl_XaText || // "TEXT"
t == fl_XaTextUriList || // "text/uri-list"
t == fl_XaCompoundText) type = t; // "COMPOUND_TEXT"
diff --git a/src/drivers/Darwin/Fl_Darwin_System_Driver.cxx b/src/drivers/Darwin/Fl_Darwin_System_Driver.cxx
index 246c38e9f..2584a21c7 100644
--- a/src/drivers/Darwin/Fl_Darwin_System_Driver.cxx
+++ b/src/drivers/Darwin/Fl_Darwin_System_Driver.cxx
@@ -101,7 +101,7 @@ int Fl_Darwin_System_Driver::filename_list(const char *d, dirent ***list, int (*
# else
int n = scandir(dirloc, list, 0, (int(*)(const void*,const void*))sort);
# endif
- // convert every filename to utf-8, and append a '/' to all
+ // convert every filename to UTF-8, and append a '/' to all
// filenames that are directories
int i;
char *fullname = (char*)malloc(dirlen+FL_PATH_MAX+3); // Add enough extra for two /'s and a nul
diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx
index f03c38940..7da208573 100644
--- a/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx
+++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx
@@ -35,7 +35,7 @@ void Fl_Graphics_Driver::global_gc()
}
/*
- * By linking this module, the following static method will instatiate the
+ * By linking this module, the following static method will instantiate the
* MSWindows GDI Graphics driver as the main display driver.
*/
Fl_Graphics_Driver *Fl_Graphics_Driver::newMainGraphicsDriver()
diff --git a/src/drivers/PicoAndroid/Fl_PicoAndroid_Graphics_Driver.cxx b/src/drivers/PicoAndroid/Fl_PicoAndroid_Graphics_Driver.cxx
index f3ea56e23..e52eaf9ec 100644
--- a/src/drivers/PicoAndroid/Fl_PicoAndroid_Graphics_Driver.cxx
+++ b/src/drivers/PicoAndroid/Fl_PicoAndroid_Graphics_Driver.cxx
@@ -35,7 +35,7 @@
/*
- * By linking this module, the following static method will instatiate the
+ * By linking this module, the following static method will instantiate the
* PicoSDL Graphics driver as the main display driver.
*/
Fl_Graphics_Driver *Fl_Graphics_Driver::newMainGraphicsDriver()
diff --git a/src/drivers/PicoSDL/Fl_PicoSDL_Graphics_Driver.cxx b/src/drivers/PicoSDL/Fl_PicoSDL_Graphics_Driver.cxx
index 571fe8560..87ffb2a0e 100644
--- a/src/drivers/PicoSDL/Fl_PicoSDL_Graphics_Driver.cxx
+++ b/src/drivers/PicoSDL/Fl_PicoSDL_Graphics_Driver.cxx
@@ -26,7 +26,7 @@
#undef __APPLE__
/*
- * By linking this module, the following static method will instatiate the
+ * By linking this module, the following static method will instantiate the
* PicoSDL Graphics driver as the main display driver.
*/
Fl_Graphics_Driver *Fl_Graphics_Driver::newMainGraphicsDriver()
diff --git a/src/drivers/Posix/Fl_Posix_System_Driver.cxx b/src/drivers/Posix/Fl_Posix_System_Driver.cxx
index 4d0dd2003..4f9c08c40 100644
--- a/src/drivers/Posix/Fl_Posix_System_Driver.cxx
+++ b/src/drivers/Posix/Fl_Posix_System_Driver.cxx
@@ -100,7 +100,7 @@ int Fl_Posix_System_Driver::filename_list(const char *d, dirent ***list, int (*s
free(dirloc);
- // convert every filename to utf-8, and append a '/' to all
+ // convert every filename to UTF-8, and append a '/' to all
// filenames that are directories
int i;
char *fullname = (char*)malloc(dirlen+FL_PATH_MAX+3); // Add enough extra for two /'s and a nul
diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx
index c288a5666..6120af72d 100644
--- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx
+++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx
@@ -33,7 +33,7 @@ void Fl_Graphics_Driver::global_gc()
}
/*
- * By linking this module, the following static method will instatiate the
+ * By linking this module, the following static method will instantiate the
* OS X Quartz Graphics driver as the main display driver.
*/
Fl_Graphics_Driver *Fl_Graphics_Driver::newMainGraphicsDriver()
diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.cxx
index aa82393fe..98dafbb7e 100644
--- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.cxx
+++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.cxx
@@ -40,7 +40,7 @@ void Fl_Graphics_Driver::global_gc()
/*
- * By linking this module, the following static method will instatiate the
+ * By linking this module, the following static method will instantiate the
* X11 Xlib Graphics driver as the main display driver.
*/
Fl_Graphics_Driver *Fl_Graphics_Driver::newMainGraphicsDriver()
diff --git a/src/xutf8/utf8Input.c b/src/xutf8/utf8Input.c
index e962969c7..231553b5d 100644
--- a/src/xutf8/utf8Input.c
+++ b/src/xutf8/utf8Input.c
@@ -449,7 +449,7 @@ XUtf8LookupString(XIC ic,
}
return len;
}
-#endif /* X11 has utf-8 */
+#endif /* X11 has UTF-8 */
#endif /* X11 only */
diff --git a/src/xutf8/utf8Utils.c b/src/xutf8/utf8Utils.c
index ae3224dce..f525f4946 100644
--- a/src/xutf8/utf8Utils.c
+++ b/src/xutf8/utf8Utils.c
@@ -93,7 +93,7 @@ XConvertUtf8ToUcs(const unsigned char *buf,
return 1;
}
- *ucs = (unsigned int) '?'; /* bad utf-8 string */
+ *ucs = (unsigned int) '?'; /* bad UTF-8 string */
return -1;
}
@@ -220,7 +220,7 @@ XFastConvertUtf8ToUcs(const unsigned char *buf,
return 1;
}
- *ucs = (unsigned int) '?'; /* bad utf-8 string */
+ *ucs = (unsigned int) '?'; /* bad UTF-8 string */
return -1;
}