diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2004-11-20 03:19:59 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2004-11-20 03:19:59 +0000 |
| commit | 23bb0590651da3f342cddcd3c87aee38a1d067cc (patch) | |
| tree | bee2ca6b14fcf94b4754a310164e0a864832dcd6 /FL/win32.H | |
| parent | a5a683f35f71f1e7ebe9a70660634cbf518b1dcd (diff) | |
Watcom fixes (STR #584, STR #594, STR #595)
Fixed library include order when building DSOs on MacOS X (STR
#596)
fl_xid() could cause a WIN32 application to crash (STR #560, STR
#576, STR #618)
Fl_Browser::remove_() removed the item from the list before
computing the item height, which caused problems with some
programs (STR #613)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3897 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL/win32.H')
| -rw-r--r-- | FL/win32.H | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/FL/win32.H b/FL/win32.H index ecdd134a9..e660d9c82 100644 --- a/FL/win32.H +++ b/FL/win32.H @@ -1,5 +1,5 @@ // -// "$Id: win32.H,v 1.15.2.3.2.12 2004/04/11 04:38:55 easysw Exp $" +// "$Id: win32.H,v 1.15.2.3.2.13 2004/11/20 03:19:57 easysw Exp $" // // WIN32 header file for the Fast Light Tool Kit (FLTK). // @@ -88,7 +88,7 @@ public: }; extern FL_EXPORT HCURSOR fl_default_cursor; extern FL_EXPORT UINT fl_wake_msg; -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;} FL_EXPORT Fl_Window* fl_find(Window xid); extern FL_EXPORT char fl_override_redirect; // hack into Fl_Window::make_xid() extern FL_EXPORT int fl_background_pixel; // hack into Fl_Window::make_xid() @@ -138,5 +138,5 @@ inline void fl_open_callback(void (*)(const char *)) {} extern FL_EXPORT int fl_parse_color(const char* p, uchar& r, uchar& g, uchar& b); // -// End of "$Id: win32.H,v 1.15.2.3.2.12 2004/04/11 04:38:55 easysw Exp $". +// End of "$Id: win32.H,v 1.15.2.3.2.13 2004/11/20 03:19:57 easysw Exp $". // |