diff options
| author | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2023-01-13 21:16:17 +0100 |
|---|---|---|
| committer | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2023-01-13 21:16:17 +0100 |
| commit | f3e21ddad24bba301a9749b43645581dee2555fb (patch) | |
| tree | 33c160da2fe5ea5f2735501e3ac45096321c1ea7 /src/drivers/Cocoa | |
| parent | dd6b9b90ee57c8020f308435a213a0d6c6c72501 (diff) | |
Fix for "Rename Fl_X* Fl_Window::i private class member" (#223)
Diffstat (limited to 'src/drivers/Cocoa')
| -rw-r--r-- | src/drivers/Cocoa/Fl_Cocoa_Gl_Window_Driver.mm | 2 | ||||
| -rw-r--r-- | src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx | 2 | ||||
| -rw-r--r-- | src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/drivers/Cocoa/Fl_Cocoa_Gl_Window_Driver.mm b/src/drivers/Cocoa/Fl_Cocoa_Gl_Window_Driver.mm index 4a9d9751b..74468ae96 100644 --- a/src/drivers/Cocoa/Fl_Cocoa_Gl_Window_Driver.mm +++ b/src/drivers/Cocoa/Fl_Cocoa_Gl_Window_Driver.mm @@ -282,7 +282,7 @@ void Fl_Cocoa_Gl_Window_Driver::after_show() { float Fl_Cocoa_Gl_Window_Driver::pixels_per_unit() { - int retina = (fl_mac_os_version >= 100700 && Fl::use_high_res_GL() && Fl_X::i(pWindow) && + int retina = (fl_mac_os_version >= 100700 && Fl::use_high_res_GL() && Fl_X::flx(pWindow) && Fl_Cocoa_Window_Driver::driver(pWindow)->mapped_to_retina()) ? 2 : 1; return retina * Fl_Graphics_Driver::default_driver().scale(); } diff --git a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx index e2ccbe969..76eee9e12 100644 --- a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx +++ b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx @@ -180,7 +180,7 @@ void Fl_Cocoa_Screen_Driver::grab(Fl_Window* win) { if (win) { if (!Fl::grab_) { - fl_capture = (FLWindow*)(Fl_X::i(Fl::first_window())->xid); + fl_capture = (FLWindow*)(Fl_X::flx(Fl::first_window())->xid); Fl_Cocoa_Window_Driver::driver(Fl::first_window())->set_key_window(); } Fl::grab_ = win; diff --git a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx index 22b6af0f8..8a0370ee1 100644 --- a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx +++ b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx @@ -58,7 +58,7 @@ void Fl_Cocoa_Window_Driver::flush_overlay() oWindow->clear_damage(FL_DAMAGE_ALL); } if (oWindow->damage() & ~FL_DAMAGE_EXPOSE) { - Fl_X *myi = Fl_X::i(pWindow); + Fl_X *myi = Fl_X::flx(pWindow); fl_clip_region(myi->region); myi->region = 0; fl_begin_offscreen(other_xid); draw(); @@ -215,7 +215,7 @@ void Fl_Cocoa_Window_Driver::shape(const Fl_Image* img) { void Fl_Cocoa_Window_Driver::hide() { - Fl_X* ip = Fl_X::i(pWindow); + Fl_X* ip = Fl_X::flx(pWindow); // MacOS X manages a single pointer per application. Make sure that hiding // a toplevel window will not leave us with some random pointer shape, or // worst case, an invisible pointer |