Applied hidden copy / ctor patch as suggested in STR 860

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4421 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Matthias Melcher
2005-07-15 09:34:53 +00:00
parent 40deaf46c6
commit 770147baf6
4 changed files with 12 additions and 7 deletions
+1
View File
@@ -2,6 +2,7 @@ CHANGES IN FLTK 1.1.7
- Documentation fixes (STR #648, STR #692, STR #730, STR
#744, STR #745)
- Improved hidden copy / ctor implementation (STR #860)
- Increased matrix stack depth and added over/underfolw error
(STR #924)
- Reverted Mac Carbon Clipping simplification that broke
+4
View File
@@ -42,6 +42,10 @@ class FL_EXPORT Fl_Group : public Fl_Widget {
int navigation(int);
static Fl_Group *current_;
// unimplemented copy ctor and assignment operator
Fl_Group(const Fl_Group&);
Fl_Group& operator=(const Fl_Group&);
protected:
+3 -7
View File
@@ -71,13 +71,9 @@ 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...
Fl_Widget & operator=(const Fl_Widget &) { return *this; }
Fl_Widget(const Fl_Widget &) {}
# endif // !WIN32 || !FL_DLL
// unimplemented copy ctor and assignment operator
Fl_Widget(const Fl_Widget &);
Fl_Widget& operator=(const Fl_Widget &);
protected:
+4
View File
@@ -60,6 +60,10 @@ class FL_EXPORT Fl_Window : public Fl_Group {
};
void _Fl_Window(); // constructor innards
// unimplemented copy ctor and assignment operator
Fl_Window(const Fl_Window&);
Fl_Window& operator=(const Fl_Window&);
protected:
static Fl_Window *current_;