diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2004-04-06 18:37:20 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2004-04-06 18:37:20 +0000 |
| commit | 9202d0798ece69683954d72a1564f0b1ec8f5fbc (patch) | |
| tree | 5d4024d6900b9c784e44c27256635c65855e1fdb | |
| parent | aa00aba5c19aa87922d12cc6664a78aa7ff56b85 (diff) | |
The Fl_Widget copy operator definitions were not conditionally
compiled properly (STR #329)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3303 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | FL/Fl_Widget.H | 14 |
2 files changed, 9 insertions, 7 deletions
@@ -2,6 +2,8 @@ CHANGES IN FLTK 1.1.5rc1 - Documentation updates (STR #245, STR #250, STR #277, STR #281, STR #328, STR #338) + - The Fl_Widget copy operator definitions were not + conditionally compiled properly (STR #329) - FLUID's Layout functionality did not move child widgets when laying out group widgets (STR #319) - FLUID's Layout->Center In Group functionality did not diff --git a/FL/Fl_Widget.H b/FL/Fl_Widget.H index 6d2cf50df..8e448d712 100644 --- a/FL/Fl_Widget.H +++ b/FL/Fl_Widget.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Widget.H,v 1.6.2.4.2.21 2003/09/04 19:07:58 easysw Exp $" +// "$Id: Fl_Widget.H,v 1.6.2.4.2.22 2004/04/06 18:37:20 easysw Exp $" // // Widget header file for the Fast Light Tool Kit (FLTK). // @@ -69,13 +69,13 @@ class FL_EXPORT Fl_Widget { const char *tooltip_; -# if defined(WIN32) && !defined(FL_DLL) - // "de-implement" the copy constructors, EXCEPT for when we are using the WIN32 DLL - // interface, in which case we can't hide them because Microsoft requires the copy - // constructors to implement subclassing... +# if !defined(WIN32) || !defined(FL_DLL) + // "de-implement" the copy constructors, EXCEPT for when we are using the + // WIN32 DLL interface, in which case we can't hide them because Microsoft + // requires the copy constructors to implement subclassing... Fl_Widget & operator=(const Fl_Widget &) { return *this; } Fl_Widget(const Fl_Widget &) {} -# endif // WIN32 && !FL_DLL +# endif // !WIN32 || !FL_DLL protected: @@ -217,5 +217,5 @@ public: #endif // -// End of "$Id: Fl_Widget.H,v 1.6.2.4.2.21 2003/09/04 19:07:58 easysw Exp $". +// End of "$Id: Fl_Widget.H,v 1.6.2.4.2.22 2004/04/06 18:37:20 easysw Exp $". // |