diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-08-14 17:05:38 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-08-14 17:05:38 +0000 |
| commit | d3c1d6b8ad76f67758adde789c95c715aa5e262b (patch) | |
| tree | e95808bdc5ede21b108d901821b563cac03c33ac /FL | |
| parent | e136d5e1454d406ac458f5503bdb6b4a76f03232 (diff) | |
OK DLLs now work again under VC++...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2585 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl_Widget.H | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/FL/Fl_Widget.H b/FL/Fl_Widget.H index a09c17b48..22ed0253f 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.17 2002/08/14 16:19:48 easysw Exp $" +// "$Id: Fl_Widget.H,v 1.6.2.4.2.18 2002/08/14 17:05:38 easysw Exp $" // // Widget header file for the Fast Light Tool Kit (FLTK). // @@ -69,9 +69,13 @@ class FL_EXPORT Fl_Widget { const char *tooltip_; - // "de-implement" the copy constructors: +# 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 &); Fl_Widget(const Fl_Widget &); +# endif // WIN32 && !FL_DLL protected: @@ -212,5 +216,5 @@ public: #endif // -// End of "$Id: Fl_Widget.H,v 1.6.2.4.2.17 2002/08/14 16:19:48 easysw Exp $". +// End of "$Id: Fl_Widget.H,v 1.6.2.4.2.18 2002/08/14 17:05:38 easysw Exp $". // |