diff options
| author | Manolo Gouy <Manolo> | 2015-12-02 09:59:37 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2015-12-02 09:59:37 +0000 |
| commit | 22af09dae7a2e17f0b1253030fd3cb7c6ce92799 (patch) | |
| tree | 9e715f50811df7a6d9a6647a61e289b06371a936 /src/Fl.cxx | |
| parent | 30e572985b24eb685e3d9eb0112017c4fc318b4d (diff) | |
Mac OS: support for high resolution OpenGL windows.
Methods Fl::event_x_pixel() and Fl::event_y_pixel() committed at r.10941
are removed. Instead method Fl_Gl_Window::pixels_per_unit() is added.
The documentation explains in more detail how to write cross-platform
FLTK code supporting high resolution OpenGL windows on retina displays.
The examples/OpenGL3test.cxx app exercises Fl_Gl_Window::pixels_per_unit().
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10945 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl.cxx')
| -rw-r--r-- | src/Fl.cxx | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/Fl.cxx b/src/Fl.cxx index 4f4b263fe..357fb55f0 100644 --- a/src/Fl.cxx +++ b/src/Fl.cxx @@ -86,9 +86,6 @@ Fl_Widget *Fl::belowmouse_, *Fl::pushed_, *Fl::focus_, *Fl::selection_owner_; -#ifdef __APPLE__ -Fl_Window *Fl::e_window_; // the window relative to which Fl::e_x and Fl::e_y are measured -#endif int Fl::damage_, Fl::e_number, Fl::e_x, @@ -1093,9 +1090,6 @@ void fl_fix_focus() { // send a FL_MOVE event so the enter/leave state is up to date Fl::e_x = Fl::e_x_root-fl_xmousewin->x(); Fl::e_y = Fl::e_y_root-fl_xmousewin->y(); -#ifdef __APPLE__ - Fl::e_window_ = fl_xmousewin; -#endif int old_event = Fl::e_number; w->handle(Fl::e_number = FL_MOVE); Fl::e_number = old_event; @@ -1186,19 +1180,10 @@ static int send_event(int event, Fl_Widget* to, Fl_Window* window) { if (w->type()>=FL_WINDOW) {dx -= w->x(); dy -= w->y();} int save_x = Fl::e_x; Fl::e_x += dx; int save_y = Fl::e_y; Fl::e_y += dy; -#ifdef __APPLE__ - Fl_Window *save_e_window = Fl::e_window_; - if (dx || dy) { - Fl::e_window_ = (to->as_window() ? to->as_window() : to->window()); - } -#endif int ret = to->handle(Fl::e_number = event); Fl::e_number = old_event; Fl::e_y = save_y; Fl::e_x = save_x; -#ifdef __APPLE__ - Fl::e_window_ = save_e_window; -#endif return ret; } |