Fix for "Rename Fl_X* Fl_Window::i private class member" (#223)

2 files changed, 5 insertions, 4 deletions

diff --git a/FL/Fl_Window.H b/FL/Fl_Window.H
index f012d59a2..5da402402 100644
--- a/FL/Fl_Window.H
+++ b/FL/Fl_Window.H
@@ -72,7 +72,7 @@ private:
   // TODO: it would make sense to merge the use of Fl_X and Fl_Window_Driver, maybe simply by
   // TODO: deriving Fl_Window_Driver from Fl_X. However, there are a lot of historic kludges
   // TODO: for some platforms around Fl_X.
-  Fl_X *i; // points at the system-specific stuff, but exists only after the window is mapped
+  Fl_X *flx_; // points at the system-specific stuff, but exists only after the window is mapped
   Fl_Window_Driver *pWindowDriver; // points at the system-specific stuff at window creation time
 
   const char* iconlabel_;
@@ -400,7 +400,7 @@ public:
     ). You can tell if a window is iconified with (w->shown()
     && !w->visible()).
   */
-  int shown() {return i != 0;}
+  int shown() {return flx_ != 0;}
   /**
     Puts the window on the screen. Usually (on X) this has the side
     effect of opening the display.
diff --git a/FL/platform.H b/FL/platform.H
index 7dfa4a186..6d757387e 100644
--- a/FL/platform.H
+++ b/FL/platform.H
@@ -57,14 +57,15 @@ public:
   Fl_X *next;
   // static variables, static functions and member functions
   static Fl_X* first;
-  static Fl_X* i(const Fl_Window* w) {return w ? (Fl_X*)w->i : 0;}
+  static Fl_X* flx(const Fl_Window* w) {return w ? (Fl_X*)w->flx_ : 0;}
 #  if defined(FLTK_USE_X11) && FLTK_USE_X11 // for backward compatibility
   static void make_xid(Fl_Window*, XVisualInfo* =fl_visual, Colormap=fl_colormap);
   static Fl_X* set_xid(Fl_Window*, Window);
+  static inline Fl_X* i(const Fl_Window* w) {return flx(w);}
 #  endif
 };
 
-inline Window fl_xid(const Fl_Window* w) { Fl_X *xTemp = Fl_X::i(w); return xTemp ? (Window)xTemp->xid : 0; }
+inline Window fl_xid(const Fl_Window* w) { Fl_X *xTemp = Fl_X::flx(w); return xTemp ? (Window)xTemp->xid : 0; }
 #else
 extern FL_EXPORT Window fl_xid_(const Fl_Window* w);
 #  define fl_xid(w) fl_xid_(w)