// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "xtistrm.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
{
wxString name = ci->GetCreateParamName(i) ;
const wxPropertyInfo* prop = map.find(name)->second ;
- wxASSERT_MSG( prop , wxT("Create Parameter not found in declared RTTI Parameters") ) ;
- WriteOneProperty( obj , prop->GetDeclaringClass() , prop , persister , data ) ;
+ if ( prop )
+ {
+ WriteOneProperty( obj , prop->GetDeclaringClass() , prop , persister , data ) ;
+ }
+ else
+ {
+ wxLogError( _("Create Parameter not found in declared RTTI Parameters") ) ;
+ }
map.erase( name ) ;
}
-
- for( wxPropertyInfoMap::iterator iter = map.begin() ; iter != map.end() ; ++iter )
- {
- const wxPropertyInfo* prop = iter->second ;
- if ( prop->GetFlags() & wxPROP_OBJECT_GRAPH )
+ { // Extra block for broken compilers
+ for( wxPropertyInfoMap::iterator iter = map.begin() ; iter != map.end() ; ++iter )
{
- WriteOneProperty( obj , prop->GetDeclaringClass() , prop , persister , data ) ;
+ const wxPropertyInfo* prop = iter->second ;
+ if ( prop->GetFlags() & wxPROP_OBJECT_GRAPH )
+ {
+ WriteOneProperty( obj , prop->GetDeclaringClass() , prop , persister , data ) ;
+ }
}
}
-
- for( wxPropertyInfoMap::iterator iter = map.begin() ; iter != map.end() ; ++iter )
- {
- const wxPropertyInfo* prop = iter->second ;
- if ( !(prop->GetFlags() & wxPROP_OBJECT_GRAPH) )
+ { // Extra block for broken compilers
+ for( wxPropertyInfoMap::iterator iter = map.begin() ; iter != map.end() ; ++iter )
{
- WriteOneProperty( obj , prop->GetDeclaringClass() , prop , persister , data ) ;
+ const wxPropertyInfo* prop = iter->second ;
+ if ( !(prop->GetFlags() & wxPROP_OBJECT_GRAPH) )
+ {
+ WriteOneProperty( obj , prop->GetDeclaringClass() , prop , persister , data ) ;
+ }
}
}
}
DoBeginWriteElement() ;
wxxVariant value = data[i] ;
- if ( persister->BeforeWriteProperty( this , pi , value ) )
+ if ( persister->BeforeWriteProperty( this , obj, pi , value ) )
{
const wxClassTypeInfo* cti = dynamic_cast< const wxClassTypeInfo* > ( elementType ) ;
if ( cti )
const wxHandlerInfo *handler = NULL ;
const wxEvtHandler * evSource = dynamic_cast<const wxEvtHandler *>(obj) ;
- wxASSERT_MSG( evSource , wxT("Illegal Object Class (Non-wxEvtHandler) as Event Source") ) ;
-
- FindConnectEntry( evSource , dti , sink , handler ) ;
- if ( persister->BeforeWriteDelegate( this , obj , ci , pi , sink , handler ) )
+ if ( evSource )
{
- if ( sink != NULL && handler != NULL )
+ FindConnectEntry( evSource , dti , sink , handler ) ;
+ if ( persister->BeforeWriteDelegate( this , obj , ci , pi , sink , handler ) )
{
- DoBeginWriteProperty( pi ) ;
- wxASSERT_MSG( IsObjectKnown( sink ) , wxT("Streaming delegates for not already streamed objects not yet supported") ) ;
- DoWriteDelegate( obj , ci , pi , sink , GetObjectID( sink ) , sink->GetClassInfo() , handler ) ;
- DoEndWriteProperty( pi ) ;
+ if ( sink != NULL && handler != NULL )
+ {
+ DoBeginWriteProperty( pi ) ;
+ if ( IsObjectKnown( sink ) )
+ {
+ DoWriteDelegate( obj , ci , pi , sink , GetObjectID( sink ) , sink->GetClassInfo() , handler ) ;
+ DoEndWriteProperty( pi ) ;
+ }
+ else
+ {
+ wxLogError( _("Streaming delegates for not already streamed objects not yet supported") ) ;
+ }
+ }
}
}
+ else
+ {
+ wxLogError(_("Illegal Object Class (Non-wxEvtHandler) as Event Source") ) ;
+ }
}
else
{
if ( pi->GetFlags() & wxPROP_ENUM_STORE_LONG )
{
const wxEnumTypeInfo *eti = dynamic_cast<const wxEnumTypeInfo*>( pi->GetTypeInfo() ) ;
- wxASSERT_MSG( eti , wxT("Type must have enum - long conversion") ) ;
- eti->ConvertFromLong( value.Get<long>() , value ) ;
+ if ( eti )
+ {
+ eti->ConvertFromLong( value.wxTEMPLATED_MEMBER_CALL(Get , long) , value ) ;
+ }
+ else
+ {
+ wxLogError( _("Type must have enum - long conversion") ) ;
+ }
}
// avoid streaming out default values
if ( value.GetAsString() == pi->GetDefaultValue().GetAsString() )
return ;
}
-
+
// avoid streaming out null objects
const wxClassTypeInfo* cti = dynamic_cast< const wxClassTypeInfo* > ( pi->GetTypeInfo() ) ;
if ( cti && value.GetAsObject() == NULL )
return ;
- if ( persister->BeforeWriteProperty( this , pi , value ) )
+ if ( persister->BeforeWriteProperty( this , obj, pi , value ) )
{
DoBeginWriteProperty( pi ) ;
if ( cti )
wxClassInfo* wxReader::GetObjectClassInfo(int objectID)
{
- assert( m_data->m_classInfos.find(objectID) != m_data->m_classInfos.end() );
+ if ( objectID == wxNullObjectID || objectID == wxInvalidObjectID )
+ {
+ wxLogError( _("Invalid or Null Object ID passed to GetObjectClassInfo" ) ) ;
+ return NULL ;
+ }
+ if ( m_data->m_classInfos.find(objectID) == m_data->m_classInfos.end() )
+ {
+ wxLogError( _("Unknown Object passed to GetObjectClassInfo" ) ) ;
+ return NULL ;
+ }
return m_data->m_classInfos[objectID] ;
}
void wxReader::SetObjectClassInfo(int objectID, wxClassInfo *classInfo )
{
- assert( m_data->m_classInfos.find(objectID) == m_data->m_classInfos.end() ) ;
+ if ( objectID == wxNullObjectID || objectID == wxInvalidObjectID )
+ {
+ wxLogError( _("Invalid or Null Object ID passed to GetObjectClassInfo" ) ) ;
+ return ;
+ }
+ if ( m_data->m_classInfos.find(objectID) != m_data->m_classInfos.end() )
+ {
+ wxLogError( _("Already Registered Object passed to SetObjectClassInfo" ) ) ;
+ return ;
+ }
m_data->m_classInfos[objectID] = classInfo ;
}
bool wxReader::HasObjectClassInfo( int objectID )
{
+ if ( objectID == wxNullObjectID || objectID == wxInvalidObjectID )
+ {
+ wxLogError( _("Invalid or Null Object ID passed to HasObjectClassInfo" ) ) ;
+ return NULL ;
+ }
return m_data->m_classInfos.find(objectID) != m_data->m_classInfos.end() ;
}
void SetObject(int objectID, wxObject *obj )
{
- assert( m_objects.find(objectID) == m_objects.end() ) ;
+ if ( m_objects.find(objectID) != m_objects.end() )
+ {
+ wxLogError( _("Passing a already registered object to SetObject") ) ;
+ return ;
+ }
m_objects[objectID] = obj ;
}
wxObject* GetObject( int objectID )
{
if ( objectID == wxNullObjectID )
return NULL ;
+ if ( m_objects.find(objectID) == m_objects.end() )
+ {
+ wxLogError( _("Passing an unkown object to GetObject") ) ;
+ return NULL ;
+ }
- assert( m_objects.find(objectID) != m_objects.end() ) ;
return m_objects[objectID] ;
}
} ;
void wxRuntimeDepersister::SetConnect(int eventSourceObjectID,
const wxClassInfo *WXUNUSED(eventSourceClassInfo),
- const wxDelegateTypeInfo *delegateInfo ,
+ const wxPropertyInfo *delegateInfo ,
const wxClassInfo *WXUNUSED(eventSinkClassInfo) ,
const wxHandlerInfo* handlerInfo ,
int eventSinkObjectID )
if ( ehsource && ehsink )
{
- if( delegateInfo->GetLastEventType() == -1 )
+ const wxDelegateTypeInfo *delegateTypeInfo = dynamic_cast<const wxDelegateTypeInfo*>(delegateInfo->GetTypeInfo());
+ if( delegateTypeInfo && delegateTypeInfo->GetLastEventType() == -1 )
{
- ehsource->Connect( -1 , delegateInfo->GetEventType() ,
+ ehsource->Connect( -1 , delegateTypeInfo->GetEventType() ,
handlerInfo->GetEventFunction() , NULL /*user data*/ ,
ehsink ) ;
}
else
{
- for ( wxEventType iter = delegateInfo->GetEventType() ; iter <= delegateInfo->GetLastEventType() ; ++iter )
+ for ( wxEventType iter = delegateTypeInfo->GetEventType() ; iter <= delegateTypeInfo->GetLastEventType() ; ++iter )
{
ehsource->Connect( -1 , iter ,
handlerInfo->GetEventFunction() , NULL /*user data*/ ,
ehsink ) ;
}
}
-
}
}
void SetObjectName(int objectID, const wxString &name )
{
- assert( m_objectNames.find(objectID) == m_objectNames.end() ) ;
+ if ( m_objectNames.find(objectID) != m_objectNames.end() )
+ {
+ wxLogError( _("Passing a already registered object to SetObjectName") ) ;
+ return ;
+ }
m_objectNames[objectID] = (const wxChar *)name;
}
+
wxString GetObjectName( int objectID )
{
if ( objectID == wxNullObjectID )
return wxT("NULL") ;
- assert( m_objectNames.find(objectID) != m_objectNames.end() ) ;
+ if ( m_objectNames.find(objectID) == m_objectNames.end() )
+ {
+ wxLogError( _("Passing an unkown object to GetObject") ) ;
+ return wxEmptyString ;
+ }
return wxString( m_objectNames[objectID].c_str() ) ;
}
} ;
if ( type->GetKind() == wxT_CUSTOM )
{
const wxCustomTypeInfo* cti = dynamic_cast<const wxCustomTypeInfo*>(type) ;
- wxASSERT_MSG( cti , wxT("Internal error, illegal wxCustomTypeInfo") ) ;
- value.Printf( wxT("%s(%s)"), cti->GetTypeName().c_str(),param.GetAsString().c_str() );
+ if ( cti )
+ {
+ value.Printf( wxT("%s(%s)"), cti->GetTypeName().c_str(),param.GetAsString().c_str() );
+ }
+ else
+ {
+ wxLogError ( _("Internal error, illegal wxCustomTypeInfo") ) ;
+ }
}
else if ( type->GetKind() == wxT_STRING )
{
void wxCodeDepersister::SetConnect(int eventSourceObjectID,
const wxClassInfo *WXUNUSED(eventSourceClassInfo),
- const wxDelegateTypeInfo *delegateInfo ,
+ const wxPropertyInfo *delegateInfo ,
const wxClassInfo *eventSinkClassInfo ,
const wxHandlerInfo* handlerInfo ,
int eventSinkObjectID )
wxString ehsource = m_data->GetObjectName( eventSourceObjectID ) ;
wxString ehsink = m_data->GetObjectName(eventSinkObjectID) ;
wxString ehsinkClass = eventSinkClassInfo->GetClassName() ;
- int eventType = delegateInfo->GetEventType() ;
- wxString handlerName = handlerInfo->GetName() ;
+ const wxDelegateTypeInfo *delegateTypeInfo = dynamic_cast<const wxDelegateTypeInfo*>(delegateInfo->GetTypeInfo());
+ if ( delegateTypeInfo )
+ {
+ int eventType = delegateTypeInfo->GetEventType() ;
+ wxString handlerName = handlerInfo->GetName() ;
- m_fp->WriteString( wxString::Format( wxT("\t%s->Connect( %s->GetId() , %d , (wxObjectEventFunction)(wxEventFunction) & %s::%s , NULL , %s ) ;") ,
- ehsource.c_str() , ehsource.c_str() , eventType , ehsinkClass.c_str() , handlerName.c_str() , ehsink.c_str() ) );
+ m_fp->WriteString( wxString::Format( wxT("\t%s->Connect( %s->GetId() , %d , (wxObjectEventFunction)(wxEventFunction) & %s::%s , NULL , %s ) ;") ,
+ ehsource.c_str() , ehsource.c_str() , eventType , ehsinkClass.c_str() , handlerName.c_str() , ehsink.c_str() ) );
+ }
+ else
+ {
+ wxLogError(_("delegate has no type info"));
+ }
}
-#include <wx/arrimpl.cpp>
+#include "wx/arrimpl.cpp"
WX_DEFINE_OBJARRAY(wxxVariantArray);
projects / wxWidgets.git / blobdiff