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/Fl_x.cxx | |
| parent | dd6b9b90ee57c8020f308435a213a0d6c6c72501 (diff) | |
Fix for "Rename Fl_X* Fl_Window::i private class member" (#223)
Diffstat (limited to 'src/Fl_x.cxx')
| -rw-r--r-- | src/Fl_x.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx index 14aacaa7b..6855f9915 100644 --- a/src/Fl_x.cxx +++ b/src/Fl_x.cxx @@ -1525,7 +1525,7 @@ int fl_handle(const XEvent& thisevent) case DestroyNotify: { // an X11 window was closed externally from the program Fl::handle(FL_CLOSE, window); - Fl_X* X = Fl_X::i(window); + Fl_X* X = Fl_X::flx(window); if (X) { // indicates the FLTK window was not closed X->xid = (Window)0; // indicates the X11 window was already destroyed window->hide(); @@ -1987,7 +1987,7 @@ int fl_handle(const XEvent& thisevent) case EnterNotify: if (xevent.xcrossing.detail == NotifyInferior) break; - // XInstallColormap(fl_display, Fl_X::i(window)->colormap); + // XInstallColormap(fl_display, Fl_X::flx(window)->colormap); set_event_xy(window); Fl::e_state = xevent.xcrossing.state << 16; event = FL_ENTER; @@ -2251,7 +2251,7 @@ void Fl_X11_Window_Driver::activate_window() { Window prev = 0; if (fl_xfocus) { - Fl_X *x = Fl_X::i(fl_xfocus); + Fl_X *x = Fl_X::flx(fl_xfocus); if (!x) return; prev = x->xid; @@ -2315,7 +2315,7 @@ Fl_X* Fl_X::set_xid(Fl_Window* win, Window winxid) { Fl_X *xp = new Fl_X; xp->xid = winxid; Fl_Window_Driver::driver(win)->other_xid = 0; - xp->w = win; win->i = xp; + xp->w = win; win->flx_ = xp; xp->next = Fl_X::first; xp->region = 0; Fl_Window_Driver::driver(win)->wait_for_expose_value = 1; @@ -2387,7 +2387,7 @@ void Fl_X::make_xid(Fl_Window* win, XVisualInfo *visual, Colormap colormap) // if the window is a subwindow and our parent is not mapped yet, we // mark this window visible, so that mapping the parent at a later // point in time will call this function again to finally map the subwindow. - if (win->parent() && !Fl_X::i(win->window())) { + if (win->parent() && !Fl_X::flx(win->window())) { win->set_visible(); return; } |