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/X11/Fl_X11_Window_Driver.cxx | |
| parent | dd6b9b90ee57c8020f308435a213a0d6c6c72501 (diff) | |
Fix for "Rename Fl_X* Fl_Window::i private class member" (#223)
Diffstat (limited to 'src/drivers/X11/Fl_X11_Window_Driver.cxx')
| -rw-r--r-- | src/drivers/X11/Fl_X11_Window_Driver.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/drivers/X11/Fl_X11_Window_Driver.cxx b/src/drivers/X11/Fl_X11_Window_Driver.cxx index 277019258..531886f7a 100644 --- a/src/drivers/X11/Fl_X11_Window_Driver.cxx +++ b/src/drivers/X11/Fl_X11_Window_Driver.cxx @@ -81,7 +81,7 @@ void Fl_X11_Window_Driver::decorated_win_size(int &w, int &h) if (!win->shown() || win->parent() || !win->border() || !win->visible()) return; Window root, parent, *children; unsigned n = 0; - Status status = XQueryTree(fl_display, Fl_X::i(win)->xid, &root, &parent, &children, &n); + Status status = XQueryTree(fl_display, Fl_X::flx(win)->xid, &root, &parent, &children, &n); if (status != 0 && n) XFree(children); // when compiz is used, root and parent are the same window // and I don't know where to find the window decoration @@ -91,7 +91,7 @@ void Fl_X11_Window_Driver::decorated_win_size(int &w, int &h) // sometimes, very wide window borders are reported // ignore them all: XWindowAttributes w_attributes; - XGetWindowAttributes(fl_display, Fl_X::i(win)->xid, &w_attributes); + XGetWindowAttributes(fl_display, Fl_X::flx(win)->xid, &w_attributes); if (attributes.width - w_attributes.width >= 20) { attributes.height -= (attributes.width - w_attributes.width); attributes.width = w_attributes.width; @@ -124,7 +124,7 @@ int Fl_X11_Window_Driver::decorated_w() void Fl_X11_Window_Driver::take_focus() { - Fl_X *i = Fl_X::i(pWindow); + Fl_X *i = Fl_X::flx(pWindow); if (!Fl_X11_Screen_Driver::ewmh_supported()) { // Save and restore the current group because 'show()' sets it to NULL. @@ -162,7 +162,7 @@ void Fl_X11_Window_Driver::flush_double() void Fl_X11_Window_Driver::flush_double(int erase_overlay) { pWindow->make_current(); // make sure fl_gc is non-zero - Fl_X *i = Fl_X::i(pWindow); + Fl_X *i = Fl_X::flx(pWindow); if (!other_xid) { other_xid = fl_create_offscreen(w(), h()); #if FLTK_USE_CAIRO @@ -201,7 +201,7 @@ void Fl_X11_Window_Driver::flush_overlay() #if FLTK_USE_CAIRO float scale = fl_graphics_driver->scale(); int W = pWindow->w() * scale, H = pWindow->h() * scale; - cairo_surface_t *s = cairo_xlib_surface_create(fl_display, Fl_X::i(pWindow)->xid, fl_visual->visual, W, H); + cairo_surface_t *s = cairo_xlib_surface_create(fl_display, Fl_X::flx(pWindow)->xid, fl_visual->visual, W, H); cairo_t *overlay_cairo = cairo_create(s); cairo_surface_destroy(s); cairo_save(overlay_cairo); @@ -323,7 +323,7 @@ void Fl_X11_Window_Driver::icons(const Fl_RGB_Image *icons[], int count) { } } - if (Fl_X::i(pWindow)) + if (Fl_X::flx(pWindow)) set_icons(); } @@ -433,7 +433,7 @@ void Fl_X11_Window_Driver::make_current() { void Fl_X11_Window_Driver::hide() { - Fl_X* ip = Fl_X::i(pWindow); + Fl_X* ip = Fl_X::flx(pWindow); if (hide_common()) return; if (ip->region) Fl_Graphics_Driver::default_driver().XDestroyRegion(ip->region); # if USE_XFT && ! FLTK_USE_CAIRO |