diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2000-12-06 15:45:13 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2000-12-06 15:45:13 +0000 |
| commit | d244d063ffef2b208bc0659909f0cf31feff795a (patch) | |
| tree | a3fbf0e7166bddc37c6c1ecdd20e75324c38bd8e /src/Fl_compose.cxx | |
| parent | a7826cdc80f888fd9d647ce41b590f57098e37fd (diff) | |
APIENTRY doesn't need to be used for the font pointers in glut.H
APIENTRY should appear between the return type and function name.
WIN32 is defined by MSVC++, not _WIN32. Updated the sources to work
with both.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@1343 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_compose.cxx')
| -rw-r--r-- | src/Fl_compose.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Fl_compose.cxx b/src/Fl_compose.cxx index b2e7721b8..53b51b495 100644 --- a/src/Fl_compose.cxx +++ b/src/Fl_compose.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_compose.cxx,v 1.1.2.4 2000/06/05 21:21:00 mike Exp $" +// "$Id: Fl_compose.cxx,v 1.1.2.5 2000/12/06 15:45:13 easysw Exp $" // // Character compose processing for the Fast Light Tool Kit (FLTK). // @@ -30,7 +30,7 @@ static const char* const compose_pairs = "`A'A^A~A:A*AAE,C`E'E^E:E`I'I^I:I-D~N`O'O^O~O:Ox O/`U'U^U:U'YTHss" "`a'a^a~a:a*aae,c`e'e^e:e`i'i^i:i-d~n`o'o^o~o:o-:o/`u'u^u:u'yth:y"; -#ifndef _WIN32 // X only +#if !defined(_WIN32) && !defined(WIN32) // X only // X dead-key lookup table. This turns a dead-key keysym into the // first of two characters for one of the compose sequences. These // keysyms start at 0xFE50. @@ -113,7 +113,7 @@ int Fl::compose(int& del) { return 1; } -#ifndef _WIN32 // X only +#if !defined(_WIN32) && !defined(WIN32) // X only // See if they typed a dead key. This gets it into the same state as // typing prefix+accent: if (i >= 0xfe50 && i <= 0xfe5b) { |