From fa9a33eaeeddb85a6afedc2d02d0d67f290b0822 Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Fri, 18 Mar 2016 18:20:11 +0000 Subject: Beginning of Albrecht's plan for Fl_Window and Fl_Window_Driver classes. Still unclear whether the implementation of the flush() functions follows the plan. The Fl_Printer class is fully rewritten under the driver model. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11364 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_Window_Driver.cxx | 31 ------------------------------- 1 file changed, 31 deletions(-) (limited to 'src/Fl_Window_Driver.cxx') diff --git a/src/Fl_Window_Driver.cxx b/src/Fl_Window_Driver.cxx index eda8c2901..484a2fbdf 100644 --- a/src/Fl_Window_Driver.cxx +++ b/src/Fl_Window_Driver.cxx @@ -89,37 +89,6 @@ void Fl_Window_Driver::destroy_double_buffer() { i->other_xid = 0; } -void Fl_Window_Driver::draw() { - // The following is similar to Fl_Group::draw(), but ... - // - // - draws the box at (0,0), i.e. with x=0 and y=0 instead of x() and y() - // - does NOT draw the label (text) - // - draws the image only if FL_ALIGN_INSIDE is set - // - // Note: The label (text) of top level windows is drawn in the title bar. - // Other windows do not draw their labels at all, unless drawn by their - // parent widgets or by special draw() methods (derived classes). - - if (pWindow->damage() & ~FL_DAMAGE_CHILD) { // draw the entire thing - pWindow->draw_box(pWindow->box(),0,0,pWindow->w(),pWindow->h(),pWindow->color()); // draw box with x/y = 0 - - if (pWindow->image() && (pWindow->align() & FL_ALIGN_INSIDE)) { // draw the image only - Fl_Label l1; - memset(&l1,0,sizeof(l1)); - l1.align_ = pWindow->align(); - l1.image = pWindow->image(); - if (!pWindow->active_r() && l1.image && l1.deimage) l1.image = l1.deimage; - l1.type = pWindow->labeltype(); - l1.draw(0,0,pWindow->w(),pWindow->h(),pWindow->align()); - } - } - pWindow->draw_children(); - -# if defined(FLTK_USE_CAIRO) - Fl::cairo_make_current(this); // checkout if an update is necessary -# endif -} - /** Assigns a non-rectangular shape to the window. This function gives an arbitrary shape (not just a rectangular region) to an Fl_Window. -- cgit v1.2.3