gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Quick fix for Fluid on X11. MSWindows version broken due to missing Fl_Printer::Helper::Helper

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11357 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Matthias Melcher 2016-03-12 23:44:57 +00:00
parent e6631a0f7f
commit 5953f5a695
5 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
FL/Fl_Double_Window.H
View File

@ -41,7 +41,6 @@ class Fl_Overlay_Window;
class FL_EXPORT Fl_Double_Window : public Fl_Window {
protected:
void flush(int eraseoverlay);
Fl_Double_Window(int X, int Y, int W, int H, const char *l, Fl_Window_Driver *driver);
public:
/**
Return non-null if this is an Fl_Overlay_Window object.

1
FL/Fl_Window.H
View File

@ -130,7 +130,6 @@ protected:
void free_icons();
Fl_Window(int x, int y, int w, int h, const char* title, Fl_Window_Driver *driver);
public:
/**

16
src/Fl_Double_Window.cxx
View File

@ -32,7 +32,7 @@
Fl_Double_Window::Fl_Double_Window(int W, int H, const char *l)
: Fl_Window(0, 0, W, H, l, Fl_Window_Driver::newWindowDriver(this))
: Fl_Window(0, 0, W, H, l)
{
type(FL_DOUBLE_WINDOW);
clear_flag(FORCE_POSITION);
@ -40,12 +40,7 @@ Fl_Double_Window::Fl_Double_Window(int W, int H, const char *l)
Fl_Double_Window::Fl_Double_Window(int X, int Y, int W, int H, const char *l)
: Fl_Window(X,Y,W,H,l, Fl_Window_Driver::newWindowDriver(this))
{
type(FL_DOUBLE_WINDOW);
}
Fl_Double_Window::Fl_Double_Window(int x, int y, int w, int h, const char* title, Fl_Window_Driver *driver) : Fl_Window(x,y,w,h,title, driver)
: Fl_Window(X,Y,W,H,l)
{
type(FL_DOUBLE_WINDOW);
}
@ -60,10 +55,15 @@ void Fl_Double_Window::show() {
return Fl_Display_Device::display_device()->driver()->can_do_alpha_blending();
}*/
/**
Forces the window to be redrawn.
*/
void Fl_Double_Window::flush() {flush(0);}
void Fl_Double_Window::flush()
{
flush(0);
}
/**
Forces the window to be redrawn.

4
src/Fl_Overlay_Window.cxx
View File

@ -30,7 +30,7 @@
Fl_Overlay_Window::Fl_Overlay_Window(int W, int H, const char *l)
: Fl_Double_Window(0,0,W,H,l,Fl_Window_Driver::newWindowDriver(this))
: Fl_Double_Window(0,0,W,H,l)
{
overlay_ = 0;
image(0);
@ -38,7 +38,7 @@ Fl_Overlay_Window::Fl_Overlay_Window(int W, int H, const char *l)
}
Fl_Overlay_Window::Fl_Overlay_Window(int X, int Y, int W, int H, const char *l)
: Fl_Double_Window(X,Y,W,H,l,Fl_Window_Driver::newWindowDriver(this))
: Fl_Double_Window(X,Y,W,H,l)
{
overlay_ = 0;
image(0);

10
src/Fl_Window.cxx
View File

@ -61,14 +61,8 @@ void Fl_Window::_Fl_Window() {
}
Fl_Window::Fl_Window(int X,int Y,int W, int H, const char *l) :
Fl_Group(X, Y, W, H, l),
pWindowDriver(Fl_Window_Driver::newWindowDriver(this))
{
_Fl_Window();
set_flag(FORCE_POSITION);
}
Fl_Window::Fl_Window(int X,int Y,int W, int H, const char *l, Fl_Window_Driver *driver) : Fl_Group(X, Y, W, H, l), pWindowDriver(driver)
Fl_Group(X, Y, W, H, l),
pWindowDriver(Fl_Window_Driver::newWindowDriver(this))
{
_Fl_Window();
set_flag(FORCE_POSITION);