mirror of
https://github.com/fltk/fltk.git
synced 2026-06-05 16:12:13 +08:00
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
This commit is contained in:
@@ -2,6 +2,8 @@ CHANGES IN FLTK 1.1.5rc1
|
|||||||
|
|
||||||
- Documentation updates (STR #245, STR #250, STR #277,
|
- Documentation updates (STR #245, STR #250, STR #277,
|
||||||
STR #281, STR #328, STR #338)
|
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
|
- FLUID's Layout functionality did not move child
|
||||||
widgets when laying out group widgets (STR #319)
|
widgets when laying out group widgets (STR #319)
|
||||||
- FLUID's Layout->Center In Group functionality did not
|
- FLUID's Layout->Center In Group functionality did not
|
||||||
|
|||||||
+7
-7
@@ -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).
|
// Widget header file for the Fast Light Tool Kit (FLTK).
|
||||||
//
|
//
|
||||||
@@ -69,13 +69,13 @@ class FL_EXPORT Fl_Widget {
|
|||||||
|
|
||||||
const char *tooltip_;
|
const char *tooltip_;
|
||||||
|
|
||||||
# if defined(WIN32) && !defined(FL_DLL)
|
# if !defined(WIN32) || !defined(FL_DLL)
|
||||||
// "de-implement" the copy constructors, EXCEPT for when we are using the WIN32 DLL
|
// "de-implement" the copy constructors, EXCEPT for when we are using the
|
||||||
// interface, in which case we can't hide them because Microsoft requires the copy
|
// WIN32 DLL interface, in which case we can't hide them because Microsoft
|
||||||
// constructors to implement subclassing...
|
// requires the copy constructors to implement subclassing...
|
||||||
Fl_Widget & operator=(const Fl_Widget &) { return *this; }
|
Fl_Widget & operator=(const Fl_Widget &) { return *this; }
|
||||||
Fl_Widget(const Fl_Widget &) {}
|
Fl_Widget(const Fl_Widget &) {}
|
||||||
# endif // WIN32 && !FL_DLL
|
# endif // !WIN32 || !FL_DLL
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|
||||||
@@ -217,5 +217,5 @@ public:
|
|||||||
#endif
|
#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 $".
|
||||||
//
|
//
|
||||||
|
|||||||
Reference in New Issue
Block a user