From c0f14ca2f00b1ea026298b0efa91c8b6afb13244 Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Mon, 18 Apr 2016 17:02:44 +0000
Subject: Move other_xid member variable from class Fl_X to class
 F_Window_Driver.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11654 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx')

diff --git a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx
index 366a4c6ef..b72a6d7a4 100644
--- a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx
+++ b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx
@@ -268,20 +268,20 @@ void Fl_WinAPI_Window_Driver::flush_double()
   Fl_X *i = Fl_X::i(pWindow);
   if (!i) return; // window not yet created
 
-  if (!i->other_xid) {
-    i->other_xid = fl_create_offscreen(w(), h());
+  if (!other_xid) {
+    other_xid = fl_create_offscreen(w(), h());
     pWindow->clear_damage(FL_DAMAGE_ALL);
   }
   if (pWindow->damage() & ~FL_DAMAGE_EXPOSE) {
     fl_clip_region(i->region); i->region = 0;
-    fl_begin_offscreen(i->other_xid);
+    fl_begin_offscreen(other_xid);
     fl_graphics_driver->clip_region( 0 );
     draw();
     fl_end_offscreen();
   }
 
   int X,Y,W,H; fl_clip_box(0,0,w(),h(),X,Y,W,H);
-  if (i->other_xid) fl_copy_offscreen(X, Y, W, H, i->other_xid, X, Y);
+  if (other_xid) fl_copy_offscreen(X, Y, W, H, other_xid, X, Y);
 }
 
 
@@ -297,13 +297,13 @@ void Fl_WinAPI_Window_Driver::flush_overlay()
   int eraseoverlay = (pWindow->damage()&FL_DAMAGE_OVERLAY);
   pWindow->clear_damage((uchar)(pWindow->damage()&~FL_DAMAGE_OVERLAY));
 
-  if (!i->other_xid) {
-    i->other_xid = fl_create_offscreen(w(), h());
+  if (!other_xid) {
+    other_xid = fl_create_offscreen(w(), h());
     pWindow->clear_damage(FL_DAMAGE_ALL);
   }
   if (pWindow->damage() & ~FL_DAMAGE_EXPOSE) {
     fl_clip_region(i->region); i->region = 0;
-    fl_begin_offscreen(i->other_xid);
+    fl_begin_offscreen(other_xid);
     fl_graphics_driver->clip_region(0);
     draw();
     fl_end_offscreen();
@@ -311,7 +311,7 @@ void Fl_WinAPI_Window_Driver::flush_overlay()
 
   if (eraseoverlay) fl_clip_region(0);
   int X, Y, W, H; fl_clip_box(0, 0, w(), h(), X, Y, W, H);
-  if (i->other_xid) fl_copy_offscreen(X, Y, W, H, i->other_xid, X, Y);
+  if (other_xid) fl_copy_offscreen(X, Y, W, H, other_xid, X, Y);
 
   if (overlay() == oWindow) oWindow->draw_overlay();
 }
-- 
cgit v1.2.3