Author: spitzak
Date: 2008-07-21 12:48:36 -0700 (Mon, 21 Jul 2008)
New Revision: 6149
Log:
Fixes for WidgetAssociation on Win32 VC++ from Felix Jirka
Modified:
trunk/fltk/WidgetAssociation.h
trunk/ide/vcnet/fltkdll.vcproj
Modified: trunk/fltk/WidgetAssociation.h
===================================================================
--- trunk/fltk/WidgetAssociation.h 2008-07-17 19:37:04 UTC (rev 6148)
+++ trunk/fltk/WidgetAssociation.h 2008-07-21 19:48:36 UTC (rev 6149)
@@ -22,7 +22,6 @@
* loop is aborted and the data pointer for the current association is
returned
*/
virtual bool handle(const AssociationType&, const Widget*, void* data) = 0;
- virtual ~AssociationFunctor();
};
/*! \relates AssociationType
@@ -36,7 +35,7 @@
* The function either returns the first associated data for which the functor
returns true, or NULL.
* See also Widget::foreach() and AssociationType::foreach().
*/
-void* FL_API foreach(const AssociationType*, const Widget*,
AssociationFunctor&);
+FL_API void* foreach(const AssociationType*, const Widget*,
AssociationFunctor&);
/*! \brief Base class for the association type.
*
Modified: trunk/ide/vcnet/fltkdll.vcproj
===================================================================
--- trunk/ide/vcnet/fltkdll.vcproj 2008-07-17 19:37:04 UTC (rev 6148)
+++ trunk/ide/vcnet/fltkdll.vcproj 2008-07-21 19:48:36 UTC (rev 6149)
@@ -4206,6 +4206,10 @@
</FileConfiguration>
</File>
<File
+ RelativePath="..\..\src\WidgetAssociation.cxx"
+ >
+ </File>
+ <File
RelativePath="..\..\src\Window.cxx"
>
<FileConfiguration
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
