From d3c1d6b8ad76f67758adde789c95c715aa5e262b Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Wed, 14 Aug 2002 17:05:38 +0000 Subject: OK DLLs now work again under VC++... git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2585 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- FL/Fl_Widget.H | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'FL') 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 $". // -- cgit v1.2.3