From 1cf4371b6908492952c0ef789e9f7566557d3cf1 Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Sat, 10 Mar 2018 16:22:44 +0000 Subject: Android: fixed some variables to avoid crashing. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12730 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/drivers/Android/Fl_Android_Graphics_Driver.H | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/drivers/Android/Fl_Android_Graphics_Driver.H') diff --git a/src/drivers/Android/Fl_Android_Graphics_Driver.H b/src/drivers/Android/Fl_Android_Graphics_Driver.H index 6e03e26da..2e2aaa8a9 100644 --- a/src/drivers/Android/Fl_Android_Graphics_Driver.H +++ b/src/drivers/Android/Fl_Android_Graphics_Driver.H @@ -110,7 +110,10 @@ protected: void mask_bitmap(uchar **value) { mask_bitmap_ = value; } int p_size; POINT *p; +#endif public: + Fl_Android_Graphics_Driver() : pWindowRegion(0L) {} +#if 0 Fl_GDI_Graphics_Driver() {mask_bitmap_ = NULL; gc_ = NULL; p_size = 0; p = NULL; depth = -1; origins = NULL;} virtual ~Fl_GDI_Graphics_Driver() { if (p) free(p); delete[] origins;} virtual int has_feature(driver_feature mask) { return mask & NATIVE; } @@ -187,7 +190,7 @@ protected: void restore_clip(); void clip_region(Fl_Region r); Fl_Region clip_region(); - static Fl_Complex_Region pWindowRegion; + Fl_Rect_Region *pWindowRegion; #if 0 virtual Fl_Region scale_clip(float f); // --- implementation is in src/fl_vertex.cxx which includes src/cfg_gfx/xxx_rect.cxx -- cgit v1.2.3