AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

removing xti code which isn't necessary for unicode under trunk anymore

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor 2011-01-08 10:22:30 +00:00
parent f06d69376d
commit c294641fd5
5 changed files with 4 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/xti2.h
View File

@ -249,7 +249,8 @@ wxObject* wxVariantOfPtrToObjectConverter##name ( const wxAny &data ) \
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 );

2
include/wx/xtihandler.h
View File

@ -19,7 +19,7 @@
#include "wx/xti.h"
// copied from event.h which cannot be included at this place, TODO MOVE to common file
// copied from event.h which cannot be included at this place
class WXDLLIMPEXP_FWD_BASE wxEvent;

47
include/wx/xtiprop.h
View File

@ -328,30 +328,6 @@ public:
Insert(iter);
}
#if wxUSE_UNICODE
wxPropertyInfo(wxPropertyInfo* &iter,
wxClassInfo* itsClass,
const wxString& name,
const char* typeName,
wxPropertyAccessor *accessor,
wxAny dv,
wxPropertyInfoFlags flags = 0,
const wxString& helpString = wxEmptyString,
const wxString& groupString = wxEmptyString) :
m_itsClass(itsClass),
m_name(name),
m_typeInfo(NULL),
m_typeName(wxString::FromAscii(typeName)),
m_collectionElementTypeInfo(NULL),
m_accessor(accessor),
m_defaultValue(dv),
m_flags(flags),
m_helpString(helpString),
m_groupString(groupString)
{
Insert(iter);
}
#endif
wxPropertyInfo(wxPropertyInfo* &iter,
wxClassInfo* itsClass,
const wxString& name,
@ -396,29 +372,6 @@ public:
Insert(iter);
}
#if wxUSE_UNICODE
wxPropertyInfo(wxPropertyInfo* &iter,
wxClassInfo* itsClass, const wxString& name,
const char* collectionTypeName,
const char* elementTypeName,
wxPropertyAccessor *accessor,
wxPropertyInfoFlags flags = 0,
const wxString& helpString = wxEmptyString,
const wxString& groupString = wxEmptyString) :
m_itsClass(itsClass),
m_name(name),
m_typeInfo(NULL),
m_typeName(wxString::FromAscii(collectionTypeName)),
m_collectionElementTypeInfo(NULL),
m_collectionElementTypeName(wxString::FromAscii(elementTypeName)),
m_accessor(accessor),
m_flags(flags),
m_helpString(helpString),
m_groupString(groupString)
{
Insert(iter);
}
#endif
~wxPropertyInfo()
{ Remove(); }

38
include/wx/xtitypes.h
View File

@ -369,6 +369,7 @@ public:
// statics:
// looks for the corresponding type, will return NULL if not found
static wxTypeInfo *FindType( const wxString& typeName );
private:
void Register();
@ -392,13 +393,6 @@ public:
const wxString &name = wxEmptyString ) :
wxTypeInfo( kind, to, from, name )
{ wxASSERT_MSG( GetKind() < wxT_SET, wxT("Illegal Kind for Base Type") ); }
#if 0 // wxUSE_UNICODE
wxBuiltInTypeInfo( wxTypeKind kind, wxVariant2StringFnc to,
wxString2VariantFnc from , const char *name ) :
wxTypeInfo( kind, to, from, name )
{ wxASSERT_MSG( GetKind() < wxT_SET, wxT("Illegal Kind for Base Type") ); }
#endif
};
class WXDLLIMPEXP_BASE wxCustomTypeInfo : public wxTypeInfo
@ -408,13 +402,6 @@ public:
wxString2VariantFnc from ) :
wxTypeInfo( wxT_CUSTOM, to, from, name )
{}
#if 0 // wxUSE_UNICODE
wxCustomTypeInfo( const char *name , wxVariant2StringFnc to,
wxString2VariantFnc from ) :
wxTypeInfo( wxT_CUSTOM, to, from, name )
{}
#endif
};
class WXDLLIMPEXP_BASE wxEnumTypeInfo : public wxTypeInfo
@ -433,17 +420,6 @@ public:
m_enumInfo = enumInfo;
}
#if 0 //wxUSE_UNICODE
wxEnumTypeInfo( wxTypeKind kind, wxEnumData* enumInfo, wxVariant2StringFnc to,
wxString2VariantFnc from, converterToLong_t toLong,
converterFromLong_t fromLong, const char * name ) :
wxTypeInfo( kind, to, from, name ), m_toLong( toLong ), m_fromLong( fromLong )
{
wxASSERT_MSG( kind == wxT_ENUM || kind == wxT_SET,
wxT("Illegal Kind for Enum Type"));
m_enumInfo = enumInfo;
}
#endif
const wxEnumData* GetEnumData() const { return m_enumInfo; }
// convert a wxAny holding data of this type into a long
@ -478,11 +454,6 @@ public:
wxVariant2StringFnc to = NULL, wxString2VariantFnc from = NULL,
const wxString &name = wxEmptyString);
#if 0 // wxUSE_UNICODE
wxClassTypeInfo( wxTypeKind kind, wxClassInfo* classInfo, wxVariant2StringFnc to,
wxString2VariantFnc from , const char *name );
#endif
const wxClassInfo *GetClassInfo() const { return m_classInfo; }
private:
@ -497,13 +468,6 @@ public:
wxTypeInfo( wxT_COLLECTION, to, from, name )
{ m_elementTypeName = elementName; m_elementType = NULL; }
#if 0 // wxUSE_UNICODE
wxCollectionTypeInfo( const char *elementName, wxVariant2StringFnc to,
wxString2VariantFnc from , const char *name ) :
wxTypeInfo( wxT_COLLECTION, to, from, name )
{ m_elementTypeName = wxString::FromAscii( elementName ); m_elementType = NULL; }
#endif
const wxTypeInfo* GetElementType() const
{
if ( m_elementType == NULL )

18
src/common/xti.cpp
View File

@ -341,30 +341,12 @@ wxTypeInfo *wxTypeInfo::FindType(const wxString& typeName)
{
wxTypeInfoMap::iterator iter = ms_typeTable->find(typeName);
//wxASSERT_MSG( iter != ms_typeTable->end(),
// wxT("lookup for a non-existent type-info") );
// FM 3/6/2007 - disabled because otherwise
// wxPropertyInfo::GetCollectionElementTypeInfo
// may easily crash
if (iter == ms_typeTable->end())
return NULL;
return (wxTypeInfo *)iter->second;
}
#if wxUSE_UNICODE
wxClassTypeInfo::wxClassTypeInfo( wxTypeKind kind, wxClassInfo* classInfo,
wxVariant2StringFnc to,
wxString2VariantFnc from,
const char *name) :
wxTypeInfo( kind, to, from, name)
{
wxASSERT_MSG( kind == wxT_OBJECT_PTR ||
kind == wxT_OBJECT,
wxT("Illegal Kind for Enum Type")); m_classInfo = classInfo;
}
#endif
wxClassTypeInfo::wxClassTypeInfo( wxTypeKind kind, wxClassInfo* classInfo,
wxVariant2StringFnc to,
wxString2VariantFnc from,