diff options
| author | Manolo Gouy <Manolo> | 2018-05-12 09:36:36 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2018-05-12 09:36:36 +0000 |
| commit | 8b7f7c78b2595b22aac6e3269bb1fd4b1a213420 (patch) | |
| tree | 5c021102fa3d997d0084118bd583373e200ee480 /src/drivers/X11 | |
| parent | 5e785121e0351698b4b375b6c51653c9c3891211 (diff) | |
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
Diffstat (limited to 'src/drivers/X11')
| -rw-r--r-- | src/drivers/X11/Fl_X11_Screen_Driver.cxx | 2 | ||||
| -rw-r--r-- | src/drivers/X11/Fl_X11_Window_Driver.H | 2 | ||||
| -rw-r--r-- | src/drivers/X11/Fl_X11_Window_Driver.cxx | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/drivers/X11/Fl_X11_Screen_Driver.cxx b/src/drivers/X11/Fl_X11_Screen_Driver.cxx index d79d31307..cb6da5d1e 100644 --- a/src/drivers/X11/Fl_X11_Screen_Driver.cxx +++ b/src/drivers/X11/Fl_X11_Screen_Driver.cxx @@ -801,7 +801,7 @@ Fl_RGB_Image *Fl_X11_Screen_Driver::read_win_rectangle(int X, int Y, int w, int RootWindow(fl_display, fl_screen), X*s, Y*s, &dxs, &dys, &child_win); dx = dxs/s; dy = dys/s; // screen dimensions - Fl::screen_xywh(sx, sy, sw, sh, win->driver()->screen_num()); + Fl::screen_xywh(sx, sy, sw, sh, Fl_Window_Driver::driver(win)->screen_num()); } if (win && !allow_outside && int(s) != s) { ws = (w+1)*s-1; diff --git a/src/drivers/X11/Fl_X11_Window_Driver.H b/src/drivers/X11/Fl_X11_Window_Driver.H index a3eb304ea..e1ff50105 100644 --- a/src/drivers/X11/Fl_X11_Window_Driver.H +++ b/src/drivers/X11/Fl_X11_Window_Driver.H @@ -92,7 +92,7 @@ private: public: Fl_X11_Window_Driver(Fl_Window*); virtual ~Fl_X11_Window_Driver(); - static inline Fl_X11_Window_Driver* driver(Fl_Window *w) {return (Fl_X11_Window_Driver*)w->driver();} + static inline Fl_X11_Window_Driver* driver(const Fl_Window *w) {return (Fl_X11_Window_Driver*)Fl_Window_Driver::driver(w);} #if USE_XFT virtual int screen_num(); static void resize_after_screen_change(void *data); diff --git a/src/drivers/X11/Fl_X11_Window_Driver.cxx b/src/drivers/X11/Fl_X11_Window_Driver.cxx index 46aa52878..fc64ee645 100644 --- a/src/drivers/X11/Fl_X11_Window_Driver.cxx +++ b/src/drivers/X11/Fl_X11_Window_Driver.cxx @@ -691,14 +691,14 @@ Fl_X11_Window_Driver::type_for_resize_window_between_screens Fl_X11_Window_Drive void Fl_X11_Window_Driver::resize_after_screen_change(void *data) { Fl_Window *win = (Fl_Window*)data; float f = Fl::screen_driver()->scale(data_for_resize_window_between_screens_.screen); - win->driver()->resize_after_scale_change(data_for_resize_window_between_screens_.screen, f, f); + Fl_Window_Driver::driver(win)->resize_after_scale_change(data_for_resize_window_between_screens_.screen, f, f); data_for_resize_window_between_screens_.busy = false; } int Fl_X11_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; } |