synchronize GTK2 minimum version in docs

[wxWidgets.git] / include / wx / xti2.h

diff --git a/include/wx/xti2.h b/include/wx/xti2.h
index 4e26e2a16cf28ef4e995ace2d1428dccf15f7874..eeb31067ea4fc9ae62bc6703a2834d818368cef4 100644 (file)
--- a/include/wx/xti2.h
+++ b/include/wx/xti2.h
@@ -124,7 +124,7 @@ wxObject* wxVariantOfPtrToObjectConverter##name ( const wxAny &data )        \
     _DEFAULT_CONSTRUCTOR(name)                                                  \
     _DEFAULT_CONVERTERS(name)                                                   \
     void wxVariantToObjectConverter##name ( const wxAny &data, wxObjectFunctor* fn )                 \
     _DEFAULT_CONSTRUCTOR(name)                                                  \
     _DEFAULT_CONVERTERS(name)                                                   \
     void wxVariantToObjectConverter##name ( const wxAny &data, wxObjectFunctor* fn )                 \

-{ (*fn)( &wxANY_AS(data, name) ); }                        \
+    { name o = wxANY_AS(data, name); (*fn)( &o ); }                        \

     \
     const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo,NULL };  \
     wxClassInfo name::ms_classInfo(name::ms_classParents, wxT(unit),                \
     \
     const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo,NULL };  \
     wxClassInfo name::ms_classInfo(name::ms_classParents, wxT(unit),                \


@@ -249,7 +249,8 @@ wxObject* wxVariantOfPtrToObjectConverter##name ( const wxAny &data )        \
     wxT(#basename2), (int) sizeof(name),         \
     (wxObjectConstructorFn) 0);
 
     wxT(#basename2), (int) sizeof(name),         \
     (wxObjectConstructorFn) 0);
 

-// templated streaming, every type must have their specialization for these methods
+// templated streaming, every type that can be converted to wxString
+// must have their specialization for these methods

 
 template<typename T>
 void wxStringReadValue( const wxString &s, T &data );
 
 template<typename T>
 void wxStringReadValue( const wxString &s, T &data );