diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2016-02-09 21:54:38 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2016-02-09 21:54:38 +0000 |
| commit | 94f0278d4771c816f3303efd2e8fa10fc6c41b7a (patch) | |
| tree | d60ad09f2f45e2d972541fe19a5a7d26bb3a1ddf /FL | |
| parent | 7a0fe79f99ea90106b035047cb37148b4f3809fc (diff) | |
Porting efforts, minimal Android stuff, cleanup.
- Moving code around for Fl_Double_Window, but not yet happy
- Tested CMake for Android cross compilation. Very happy!
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11142 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl_Graphics_Driver.H | 1 | ||||
| -rw-r--r-- | FL/fl_utf8.h | 3 | ||||
| -rw-r--r-- | FL/x.H | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/FL/Fl_Graphics_Driver.H b/FL/Fl_Graphics_Driver.H index 45e008a6a..1b5452bed 100644 --- a/FL/Fl_Graphics_Driver.H +++ b/FL/Fl_Graphics_Driver.H @@ -136,6 +136,7 @@ public: Fl_Graphics_Driver(); virtual ~Fl_Graphics_Driver() { if (p) free(p); } public: + virtual char can_do_alpha_blending() { return 0; } // --- implementation is in src/fl_rect.cxx which includes src/drivers/xxx/Fl_xxx_Graphics_Driver_rect.cxx virtual void point(int x, int y) = 0; virtual void rect(int x, int y, int w, int h) = 0; diff --git a/FL/fl_utf8.h b/FL/fl_utf8.h index b19f2a962..2b283400d 100644 --- a/FL/fl_utf8.h +++ b/FL/fl_utf8.h @@ -57,6 +57,9 @@ # include <wchar.h> # include <sys/stat.h> # define xchar wchar_t +#elif defined(ANDROID) +# include <wchar.h> +# define xchar wchar_t #elif defined(FL_PORTING) # pragma message "FL_PORTING: include utf8 support files and define utf8 types" # define xchar unsigned short @@ -30,6 +30,8 @@ # include "win32.H" # elif defined(__APPLE__) # include "mac.H" +# elif defined(ANDROID) +# error "A clean port requires a driver-style system for Fl_X" # elif defined(FL_PORTING) # pragma message "FL_PORTING: write a header file based on this file, win32.H, or mac.H to define the FLTK core internals" # include "porting.H" |