mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Complete the implementations of virtual Fl_X* Fl_Window_Driver::makeWindow() with the X11 platform.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11661 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2016-04-19 16:00:30 +00:00
parent 24487a719f
commit f29fb8c539
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FL/Fl_Window_Driver.H
View File

@ -123,7 +123,7 @@ public:
virtual void make_current();
virtual void label(const char *name, const char *mininame);
virtual Fl_X *makeWindow() { /* FIXME: move Fl_X::make(Fl_Window*) here for OSX, MSWin, and X11 */ return 0; }
virtual Fl_X *makeWindow() { return 0; }
virtual void wait_for_expose();
virtual void destroy_double_buffer();
virtual void show();

2
src/Fl_x.cxx
View File

@ -2824,7 +2824,7 @@ void Fl_X11_Window_Driver::show() {
if (pWindow->type() != FL_DOUBLE_WINDOW && can_boxcheat(pWindow->box())) {
fl_background_pixel = int(fl_xpixel(pWindow->color()));
}
Fl_X::make_xid(pWindow);
makeWindow();
} else {
XMapRaised(fl_display, fl_xid(pWindow));
}

1
src/drivers/X11/Fl_X11_Window_Driver.H
View File

@ -84,6 +84,7 @@ public:
virtual int decorated_h();
// --- window management
virtual Fl_X *makeWindow();
virtual void take_focus();
virtual void flush_double();
virtual void flush_overlay();

6
src/drivers/X11/Fl_X11_Window_Driver.cxx
View File

@ -666,6 +666,12 @@ int Fl_X11_Window_Driver::scroll(int src_x, int src_y, int src_w, int src_h, int
return 0;
}
Fl_X *Fl_X11_Window_Driver::makeWindow()
{
Fl_X::make_xid(pWindow, fl_visual, fl_colormap);
return Fl_X::i(pWindow);
}
//
// End of "$Id$".
//