diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2018-03-24 13:06:59 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2018-03-24 13:06:59 +0000 |
| commit | 79b31708de7b1544d0e7b32d616ecb9b79d1b9bd (patch) | |
| tree | 4bcb449bcc1e90269f7c04ada08eab1762d8a199 /src/drivers/Android/Fl_Android_Window_Driver.H | |
| parent | db55dfbbd6e161ab1388583ef6834137a4a380e1 (diff) | |
Android: Made popup and menu windows work, fixed Fl::wait() recursion,
fixed incompatible Fl::wait() behavior.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12793 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/drivers/Android/Fl_Android_Window_Driver.H')
| -rw-r--r-- | src/drivers/Android/Fl_Android_Window_Driver.H | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/drivers/Android/Fl_Android_Window_Driver.H b/src/drivers/Android/Fl_Android_Window_Driver.H index 49be9a913..95c31b247 100644 --- a/src/drivers/Android/Fl_Android_Window_Driver.H +++ b/src/drivers/Android/Fl_Android_Window_Driver.H @@ -71,12 +71,17 @@ private: #endif public: - Fl_Android_Window_Driver(Fl_Window *w) : Fl_Window_Driver(w) {} - ~Fl_Android_Window_Driver() {} static inline Fl_Android_Window_Driver* driver(Fl_Window *w) { return (Fl_Android_Window_Driver*)w->driver(); } + Fl_Android_Window_Driver(Fl_Window *w) : Fl_Window_Driver(w) {} + virtual ~Fl_Android_Window_Driver() override {} + + virtual void make_current() override; + virtual void show() override; + virtual void hide() override; + #if 0 HDC private_dc; // used for OpenGL RECT border_width_title_bar_height(int &bx, int &by, int &bt); @@ -103,13 +108,8 @@ public: virtual void flush_double(); virtual void flush_overlay(); virtual void draw_begin(); -#endif - virtual void make_current(); - virtual void show(); -#if 0 virtual void label(const char *name,const char *iname); virtual void resize(int X,int Y,int W,int H); - virtual void hide(); virtual void map(); virtual void unmap(); virtual void fullscreen_on(); @@ -136,8 +136,6 @@ public: void wait_for_expose() { wait_for_expose_value = 1; } static void expose_all(); -// Leuwer: 0171 473 1850 - }; |