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

Fix the "bizarre makefile build error" due to double declarations of fl_clip_region(Fl_Region).

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11416 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2016-03-24 05:59:35 +00:00
parent 2543075ea0
commit 6e141d14df
4 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
FL/mac.H
View File

@ -215,7 +215,6 @@ extern CGContextRef fl_gc;
extern Window fl_xid(const Fl_Window*);
extern Fl_Window* fl_find(Window xid);
void fl_clip_region(Fl_Region);
extern Fl_Bitmask fl_create_bitmask(int w, int h, const uchar *data);
extern Fl_Bitmask fl_create_alphamask(int w, int h, int d, int ld, const uchar *data);

1
FL/win32.H
View File

@ -107,7 +107,6 @@ FL_EXPORT Window fl_xid_(const Fl_Window* w);
#endif // FL_LIBRARY || FL_INTERNALS
FL_EXPORT Fl_Window* fl_find(Window xid);
void fl_clip_region(Fl_Region);
// most recent fl_color() or fl_rgbcolor() points at one of these:
extern FL_EXPORT struct Fl_XMap {

2
FL/x.H
View File

@ -67,8 +67,6 @@ extern FL_EXPORT GC fl_gc;
extern FL_EXPORT Window fl_window;
FL_EXPORT ulong fl_xpixel(Fl_Color i);
FL_EXPORT ulong fl_xpixel(uchar r, uchar g, uchar b);
FL_EXPORT void fl_clip_region(Fl_Region);
FL_EXPORT Fl_Region fl_clip_region();
// feed events into fltk:
FL_EXPORT int fl_handle(const XEvent&);

5
src/Fl_Window.cxx
View File

@ -21,11 +21,12 @@
// crap you need to do to communicate with X is in Fl_x.cxx, the
// equivalent (but totally different) crap for MSWindows is in Fl_win32.cxx
#include <FL/Fl.H>
#include <FL/x.H>
#include <FL/Fl_Window_Driver.H>
#include <FL/Fl_RGB_Image.H>
#include <FL/Fl_Window.H>
#include <FL/Fl_Tooltip.H>
#include <FL/Fl_Graphics_Driver.H> // for fl_graphics_driver
#include <FL/fl_draw.H>
#include <stdlib.h>
#include "flstring.h"
@ -443,7 +444,7 @@ void Fl_Window::flush()
{
if (!shown()) return;
make_current();
fl_graphics_driver->clip_region(i->region);
fl_clip_region(i->region);
i->region = 0;
draw();
}