mirrors
/
fltk
mirror of https://github.com/fltk/fltk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Redefined fl_xid() as an inline function when used inside the FLTK library. 

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8295 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2011-01-20 13:22:30 +00:00
parent 30c1eed80b
commit a306fe46d3
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
FL/win32.H
View File

@ -101,9 +101,13 @@ extern FL_EXPORT HPALETTE fl_palette; // non-zero only on 8-bit displays!
extern FL_EXPORT void fl_release_dc(HWND w, HDC dc);
extern FL_EXPORT void fl_save_dc( HWND w, HDC dc);
inline Window fl_xid(const Fl_Window* w) { Fl_X *temp = Fl_X::i(w); return temp ? temp->xid : 0; }
#else
FL_EXPORT Window fl_xid_(const Fl_Window* w);
#define fl_xid(w) fl_xid_(w)
#endif // FL_LIBRARY || FL_INTERNALS
extern FL_EXPORT Window fl_xid(const Fl_Window*w);
FL_EXPORT Fl_Window* fl_find(Window xid);
FL_EXPORT void fl_clip_region(Fl_Region);

9
FL/x.H
View File

@ -163,10 +163,15 @@ public:
extern FL_EXPORT char fl_override_redirect; // hack into Fl_X::make_xid()
extern FL_EXPORT int fl_background_pixel; // hack into Fl_X::make_xid()
inline Window fl_xid(const Fl_Window* w) { return Fl_X::i(w)->xid; }
#else
extern Window fl_xid_(const Fl_Window* w);
#define fl_xid(w) fl_xid_(w)
#endif // FL_LIBRARY || FL_INTERNALS
// convert xid <-> Fl_Window:
Window fl_xid(const Fl_Window*w);
FL_EXPORT Fl_Window* fl_find(Window xid);

2
src/Fl_win32.cxx
View File

@ -1933,7 +1933,7 @@ Fl_Region XRectangleRegion(int x, int y, int w, int h) {
return CreatePolygonRgn(pt, 4, ALTERNATE);
}
Window fl_xid(const Fl_Window *w) {
Window fl_xid_(const Fl_Window *w) {
Fl_X *temp = Fl_X::i(w);
return temp ? temp->xid : 0;
}

2
src/Fl_x.cxx
View File

@ -1880,7 +1880,7 @@ void Fl_Window::make_current() {
#endif
}
Window fl_xid(const Fl_Window* w)
Window fl_xid_(const Fl_Window* w)
{
return Fl_X::i(w)->xid;
}