diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2009-12-06 22:21:55 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2009-12-06 22:21:55 +0000 |
| commit | b2cffc688ea7abbddabc9ed23deea1921f59ac9d (patch) | |
| tree | 74a50bdb133fd6b5af7c785541bcc46e2e8e9c15 /src/Fl_compose.cxx | |
| parent | 1ea4b4573538f2d53960dd8a4ef4f35480d2f5f7 (diff) | |
Moved OS X code base to the more moder Cocoa toolkit thanks to the awesome work of Manolo Gouy (STR #2221). This is a big one! I tested all test applications under 32-bit autoconf and Xcode, and a few apps under 64bit intel. No PPC testing was done. Please verify this patch if you have the machine!
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6951 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_compose.cxx')
| -rw-r--r-- | src/Fl_compose.cxx | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/Fl_compose.cxx b/src/Fl_compose.cxx index a24fa8a85..a272c055e 100644 --- a/src/Fl_compose.cxx +++ b/src/Fl_compose.cxx @@ -26,6 +26,7 @@ // #include <FL/Fl.H> +#include <FL/x.H> // // MRS: Uncomment the following define to get the original (pre-1.1.2) @@ -38,6 +39,15 @@ #ifdef __APPLE__ +#ifdef __APPLE_COCOA__ + +static const char* const compose_pairs = +" ! % # $ y=| & : c a <<~ - r _ * +-2 3 ' u p . , 1 o >>141234? "//00A0 ... +"`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" //00C0 ... +"`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";//00E0 ... + +#else + static const char* const compose_pairs = ":A*A,C'E~N:O:U'a`a^a:a~a*a,c'e`e" "^e:e'i`i^i:i~n'o`o^o:o~o'u`u^u:u" @@ -48,6 +58,8 @@ static const char* const compose_pairs = "++..,,_\"%%^A^E'A:E`E'I^I:I`I'O^O" "mc`O'U^U`U||^ ~^_ u . * , ~-; v "; +#endif + #else static const char* const compose_pairs = |