diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2003-09-04 19:07:58 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2003-09-04 19:07:58 +0000 |
| commit | 549563068451e1e19eb33e4ea535eccd5856814f (patch) | |
| tree | abf3840b57b2b499ccc996e64911fe66906b1993 | |
| parent | 8bfa7d85795756bf01713a5ad5a63356df38cf83 (diff) | |
Provide inline code for copy operators in Fl_Widget; this works around
a VC++ 7.1 regression without causing problems. (STR #156)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3090 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | CHANGES | 4 | ||||
| -rw-r--r-- | FL/Fl_Widget.H | 8 |
2 files changed, 8 insertions, 4 deletions
@@ -1,5 +1,9 @@ CHANGES IN FLTK 1.1.4 + - VC++ 7.1 didn't like how the copy operators were + disabled for the Fl_Widget class; now include inline + code which will never be used but makes VC++ happy + (STR #156) - Fixed an IRIX compile problem caused by a missing #include (STR #157) - FLUID didn't write color/selection_color() calls using diff --git a/FL/Fl_Widget.H b/FL/Fl_Widget.H index 461385bc4..6d2cf50df 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.20 2003/01/30 21:40:34 easysw Exp $" +// "$Id: Fl_Widget.H,v 1.6.2.4.2.21 2003/09/04 19:07:58 easysw Exp $" // // Widget header file for the Fast Light Tool Kit (FLTK). // @@ -73,8 +73,8 @@ class FL_EXPORT Fl_Widget { // "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 &); - Fl_Widget(const Fl_Widget &); + Fl_Widget & operator=(const Fl_Widget &) { return *this; } + Fl_Widget(const Fl_Widget &) {} # endif // WIN32 && !FL_DLL protected: @@ -217,5 +217,5 @@ public: #endif // -// End of "$Id: Fl_Widget.H,v 1.6.2.4.2.20 2003/01/30 21:40:34 easysw Exp $". +// End of "$Id: Fl_Widget.H,v 1.6.2.4.2.21 2003/09/04 19:07:58 easysw Exp $". // |