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 /FL | |
| 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 'FL')
| -rw-r--r-- | FL/Fl_Window.H | 4 | ||||
| -rw-r--r-- | FL/Fl_Window_Driver.H | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/FL/Fl_Window.H b/FL/Fl_Window.H index f05281671..4153199bf 100644 --- a/FL/Fl_Window.H +++ b/FL/Fl_Window.H @@ -527,8 +527,6 @@ public: */ int decorated_h() const; - Fl_Window_Driver *driver() const { return pWindowDriver; } - // Note: Doxygen docs in Fl_Widget.H to avoid redundancy. virtual Fl_Window* as_window() { return this; } @@ -545,7 +543,7 @@ public: void shape(const Fl_Image* img); void shape(const Fl_Image& b) ; int is_shaped(); - + inline int screen_num(); }; #endif diff --git a/FL/Fl_Window_Driver.H b/FL/Fl_Window_Driver.H index 45546158d..41c2e75a9 100644 --- a/FL/Fl_Window_Driver.H +++ b/FL/Fl_Window_Driver.H @@ -181,6 +181,7 @@ public: #endif virtual int scroll(int src_x, int src_y, int src_w, int src_h, int dest_x, int dest_y, void (*draw_area)(void*, int,int,int,int), void* data) { return 0; } + static Fl_Window_Driver* driver(const Fl_Window *win) {return win->pWindowDriver;} }; #endif // FL_WINDOW_DRIVER_H |