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

Fix potential crash in fl_xid() on Linux (STR #2635). This would

Browse Source 
crash if called when a window is not shown().


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8706 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Albrecht Schlosser 2011-05-21 10:05:19 +00:00
parent b87a0b7390
commit fce1e80ee3
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -146,6 +146,7 @@ CHANGES IN FLTK 1.3.0
Bug Fixes
- Fixed potential crash in fl_xid() on Linux (STR #2635)
- Fixed keyboard navigation in fl_choice() (STR #2591)
- Fixed alpha blending under X11 when line data size != 0 (STR #2606)
- Fixed Fl_Tabs selection border drawing, if tabs are at the bottom

2
FL/x.H
View File

@ -174,7 +174,7 @@ 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; }
inline Window fl_xid(const Fl_Window* w) { Fl_X *temp = Fl_X::i(w); return temp ? temp->xid : 0; }
#else

7
src/Fl_x.cxx
View File

@ -1902,12 +1902,11 @@ void Fl_Window::make_current() {
#endif
}
Window fl_xid_(const Fl_Window* w)
{
return Fl_X::i(w)->xid;
Window fl_xid_(const Fl_Window *w) {
Fl_X *temp = Fl_X::i(w);
return temp ? temp->xid : 0;
}
int Fl_Window::decorated_h()
{
if (parent() || !shown()) return h();