From 5f14fc3e9b81d082966665209c4246cbdfee0005 Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Sun, 27 Mar 2016 06:58:54 +0000 Subject: Rewrite Fl_Overlay_Window class under the driver model. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11440 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/drivers/Cocoa') diff --git a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx index 22a819dcb..3e60db8a9 100644 --- a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx +++ b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx @@ -64,7 +64,7 @@ void Fl_Cocoa_Window_Driver::flush_double() { void Fl_Cocoa_Window_Driver::flush_overlay() { Fl_Overlay_Window *oWindow = pWindow->as_overlay_window(); - int erase_overlay = (pWindow->damage()&FL_DAMAGE_OVERLAY) | (oWindow->overlay_ == oWindow); + int erase_overlay = (pWindow->damage()&FL_DAMAGE_OVERLAY) | (overlay() == oWindow); pWindow->clear_damage((uchar)(pWindow->damage()&~FL_DAMAGE_OVERLAY)); if (!oWindow->shown()) return; @@ -80,10 +80,10 @@ void Fl_Cocoa_Window_Driver::flush_overlay() if ( myi->other_xid ) { fl_begin_offscreen( myi->other_xid ); fl_clip_region( 0 ); - oWindow->draw(); + draw(); fl_end_offscreen(); } else { - oWindow->draw(); + draw(); } } if (erase_overlay) fl_clip_region(0); @@ -92,7 +92,7 @@ void Fl_Cocoa_Window_Driver::flush_overlay() int X,Y,W,H; fl_clip_box(0,0,oWindow->w(),oWindow->h(),X,Y,W,H); if (myi->other_xid) fl_copy_offscreen(X, Y, W, H, myi->other_xid, X, Y); - if (oWindow->overlay_ == oWindow) oWindow->draw_overlay(); + if (overlay() == oWindow) oWindow->draw_overlay(); } -- cgit v1.2.3