From 8b7f7c78b2595b22aac6e3269bb1fd4b1a213420 Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Sat, 12 May 2018 09:36:36 +0000
Subject: Remove public member function Fl_Window_Driver *Fl_Window::driver()
 so class Fl_Window_Driver is not in FLTK public API.

This function is replaced by static Fl_Window_Driver* Fl_Window_Driver::(const Fl_Window *win).
The purpose is to have class Fl_Window_Driver outside from FLTK ABI.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12915 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/drivers/Android/Fl_Android_Window_Driver.H   | 4 ++--
 src/drivers/Android/Fl_Android_Window_Driver.cxx | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/drivers/Android')

diff --git a/src/drivers/Android/Fl_Android_Window_Driver.H b/src/drivers/Android/Fl_Android_Window_Driver.H
index 1df475a3d..6ade10cf4 100644
--- a/src/drivers/Android/Fl_Android_Window_Driver.H
+++ b/src/drivers/Android/Fl_Android_Window_Driver.H
@@ -71,8 +71,8 @@ private:
 #endif
 
 public:
-  static inline Fl_Android_Window_Driver* driver(Fl_Window *w) {
-    return (Fl_Android_Window_Driver*)w->driver();
+  static inline Fl_Android_Window_Driver* driver(const Fl_Window *w) {
+    return (Fl_Android_Window_Driver*)Fl_Window_Driver::driver(w);
   }
 
   Fl_Android_Window_Driver(Fl_Window *w) : Fl_Window_Driver(w) {}
diff --git a/src/drivers/Android/Fl_Android_Window_Driver.cxx b/src/drivers/Android/Fl_Android_Window_Driver.cxx
index 4e10d6d7d..05fd80020 100644
--- a/src/drivers/Android/Fl_Android_Window_Driver.cxx
+++ b/src/drivers/Android/Fl_Android_Window_Driver.cxx
@@ -99,7 +99,7 @@ void Fl_Android_Window_Driver::expose_all()
 {
   for (Fl_X *x = Fl_X::first; x; x = x->next) {
     Fl_Window *win = x->w;
-    win->driver()->wait_for_expose_value = 0;
+    Fl_Android_Window_Driver::driver(win)->wait_for_expose_value = 0;
     win->damage(FL_DAMAGE_EXPOSE);
     win->redraw();
   }
-- 
cgit v1.2.3