diff options
| author | Manolo Gouy <Manolo> | 2016-04-04 10:39:42 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2016-04-04 10:39:42 +0000 |
| commit | 01ef0a6ec6705b6fa3bb05cee89395c9f74367f1 (patch) | |
| tree | 03badf229c1e329320915b127f1b32591fa906ff /src | |
| parent | bc11bd8d5feacbdba26a22118294b3a1ae852908 (diff) | |
Modify files keysym2Ucs.c, utf8Input.c, utf8Utils.c and utf8Wrap.c for the driver model.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11526 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/xutf8/keysym2Ucs.c | 8 | ||||
| -rw-r--r-- | src/xutf8/utf8Input.c | 9 | ||||
| -rw-r--r-- | src/xutf8/utf8Utils.c | 12 | ||||
| -rw-r--r-- | src/xutf8/utf8Wrap.c | 12 |
4 files changed, 8 insertions, 33 deletions
diff --git a/src/xutf8/keysym2Ucs.c b/src/xutf8/keysym2Ucs.c index b811d4054..6115b8c2e 100644 --- a/src/xutf8/keysym2Ucs.c +++ b/src/xutf8/keysym2Ucs.c @@ -16,11 +16,9 @@ #define KEYSYM2UCS_INCLUDED -#if defined(WIN32) -#elif defined(__APPLE__) /* PORTME: Fl_Screen_Driver - platform unicode */ -#elif defined(FL_PORTING) -# pragma message "FL_PORTING: do you want to include Xutf8.h?" -#else +#include <config.h> + +#if defined(USE_X11) #include "../Xutf8.h" #include "imKStoUCS.c" diff --git a/src/xutf8/utf8Input.c b/src/xutf8/utf8Input.c index bba400271..baf2432a1 100644 --- a/src/xutf8/utf8Input.c +++ b/src/xutf8/utf8Input.c @@ -14,13 +14,10 @@ * http://www.fltk.org/str.php */ -#if defined(WIN32) -#elif defined(__APPLE__) /* PORTME: Fl_Screen_Driver - platform unicode */ -#elif defined(FL_PORTING) -# pragma message "FL_PORTING: do you want to include Xutf8.h?" -#else - #include <config.h> + +#if defined(USE_X11) + #include "../Xutf8.h" #include <X11/X.h> #include <X11/Xlib.h> diff --git a/src/xutf8/utf8Utils.c b/src/xutf8/utf8Utils.c index 9be6f8607..83c233c38 100644 --- a/src/xutf8/utf8Utils.c +++ b/src/xutf8/utf8Utils.c @@ -16,21 +16,11 @@ #include <config.h> -#if defined(WIN32) || defined(__APPLE__) /* PORTME: Fl_Screen_Driver - platform unicode */ -#elif defined(FL_PORTING) -# pragma message "FL_PORTING: utf8" -#else -#endif - /* * Unicode to UTF-8 conversion functions. */ -#if defined(WIN32) -#elif defined(__APPLE__) -#elif defined(FL_PORTING) -# pragma message "FL_PORTING: do you want to include Xutf8.h?" -#else +#if defined(USE_X11) #include "../Xutf8.h" diff --git a/src/xutf8/utf8Wrap.c b/src/xutf8/utf8Wrap.c index d7321b289..4920ab02d 100644 --- a/src/xutf8/utf8Wrap.c +++ b/src/xutf8/utf8Wrap.c @@ -16,20 +16,10 @@ #include <config.h> -#if defined(WIN32) || defined(__APPLE__) /* PORTME: Fl_Screen_Driver - platform unicode */ -#elif defined(FL_PORTING) -# pragma message "FL_PORTING: utf8" -#else -#endif - /* * X11 UTF-8 text drawing functions. */ -#if defined(WIN32) -#elif defined(__APPLE__) -#elif defined(FL_PORTING) -# pragma message "FL_PORTING: do you want to include Xutf8.h?" -#else +#if defined(USE_X11) #include "../Xutf8.h" #include <X11/Xlib.h> |