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/WinAPI/Fl_WinAPI_Window_Driver.H   | 2 +-
 src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/drivers/WinAPI')

diff --git a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H
index 72996db60..44cc06ccc 100644
--- a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H
+++ b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H
@@ -68,7 +68,7 @@ private:
 public:
   Fl_WinAPI_Window_Driver(Fl_Window*);
   ~Fl_WinAPI_Window_Driver();
-  static inline Fl_WinAPI_Window_Driver* driver(Fl_Window *w) {return (Fl_WinAPI_Window_Driver*)w->driver();}
+  static inline Fl_WinAPI_Window_Driver* driver(const Fl_Window *w) {return (Fl_WinAPI_Window_Driver*)Fl_Window_Driver::driver(w);}
   HDC private_dc; // used for OpenGL
   RECT border_width_title_bar_height(int &bx, int &by, int &bt);
   virtual void screen_num(int n);
diff --git a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx
index dd45ad2ad..3b6974330 100644
--- a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx
+++ b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx
@@ -64,7 +64,7 @@ Fl_WinAPI_Window_Driver::~Fl_WinAPI_Window_Driver()
 
 int Fl_WinAPI_Window_Driver::screen_num() {
   if (pWindow->parent()) {
-    screen_num_ = pWindow->top_window()->driver()->screen_num();
+    screen_num_ = Fl_Window_Driver::driver(pWindow->top_window())->screen_num();
   }
   return screen_num_ >= 0 ? screen_num_ : 0;
 }
@@ -694,7 +694,7 @@ void Fl_WinAPI_Window_Driver::resize_after_screen_change(void *data) {
   GetClientRect(fl_xid(win), &r);
   float old_f = float(r.right)/win->w();
   int ns = data_for_resize_window_between_screens_.screen;
-  win->driver()->resize_after_scale_change(ns, old_f, Fl::screen_driver()->scale(ns));
+  Fl_Window_Driver::driver(win)->resize_after_scale_change(ns, old_f, Fl::screen_driver()->scale(ns));
   data_for_resize_window_between_screens_.busy = false;
 }
 
-- 
cgit v1.2.3