Globally replace _T() with wxT().
Standardize on using a single macro across all wxWidgets sources and solve the name clash with Sun CC standard headers (see #10660). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -422,11 +422,11 @@ public :
|
||||
// convert a wxxVariant holding data of this type into a string
|
||||
void ConvertToString( const wxxVariant& data , wxString &result ) const
|
||||
|
||||
{ if ( m_toString ) (*m_toString)( data , result ) ; else wxLogError( wxGetTranslation(_T("String conversions not supported")) ) ; }
|
||||
{ if ( m_toString ) (*m_toString)( data , result ) ; else wxLogError( wxGetTranslation(wxT("String conversions not supported")) ) ; }
|
||||
|
||||
// convert a string into a wxxVariant holding the corresponding data in this type
|
||||
void ConvertFromString( const wxString& data , wxxVariant &result ) const
|
||||
{ if( m_fromString ) (*m_fromString)( data , result ) ; else wxLogError( wxGetTranslation(_T("String conversions not supported")) ) ; }
|
||||
{ if( m_fromString ) (*m_fromString)( data , result ) ; else wxLogError( wxGetTranslation(wxT("String conversions not supported")) ) ; }
|
||||
|
||||
#if wxUSE_UNICODE
|
||||
static wxTypeInfo *FindType(const char *typeName) { return FindType( wxString::FromAscii(typeName) ) ; }
|
||||
@@ -503,11 +503,11 @@ public :
|
||||
// convert a wxxVariant holding data of this type into a long
|
||||
void ConvertToLong( const wxxVariant& data , long &result ) const
|
||||
|
||||
{ if( m_toLong ) (*m_toLong)( data , result ) ; else wxLogError( wxGetTranslation(_T("Long Conversions not supported")) ) ; }
|
||||
{ if( m_toLong ) (*m_toLong)( data , result ) ; else wxLogError( wxGetTranslation(wxT("Long Conversions not supported")) ) ; }
|
||||
|
||||
// convert a long into a wxxVariant holding the corresponding data in this type
|
||||
void ConvertFromLong( long data , wxxVariant &result ) const
|
||||
{ if( m_fromLong ) (*m_fromLong)( data , result ) ; else wxLogError( wxGetTranslation(_T("Long Conversions not supported")) ) ;}
|
||||
{ if( m_fromLong ) (*m_fromLong)( data , result ) ; else wxLogError( wxGetTranslation(wxT("Long Conversions not supported")) ) ;}
|
||||
|
||||
private :
|
||||
converterToLong_t m_toLong ;
|
||||
@@ -843,19 +843,19 @@ public :
|
||||
|
||||
// Setting a simple property (non-collection)
|
||||
virtual void SetProperty(wxObject *object, const wxxVariant &value) const
|
||||
{ if ( m_setter ) m_setter->Set( object , value ) ; else wxLogError( wxGetTranslation(_T("SetProperty called w/o valid setter")) ) ;}
|
||||
{ if ( m_setter ) m_setter->Set( object , value ) ; else wxLogError( wxGetTranslation(wxT("SetProperty called w/o valid setter")) ) ;}
|
||||
|
||||
// Getting a simple property (non-collection)
|
||||
virtual void GetProperty(const wxObject *object, wxxVariant &result) const
|
||||
{ if ( m_getter ) m_getter->Get( object , result ) ; else wxLogError( wxGetTranslation(_T("GetProperty called w/o valid getter")) ) ;}
|
||||
{ if ( m_getter ) m_getter->Get( object , result ) ; else wxLogError( wxGetTranslation(wxT("GetProperty called w/o valid getter")) ) ;}
|
||||
|
||||
// Adding an element to a collection property
|
||||
virtual void AddToPropertyCollection(wxObject *object, const wxxVariant &value) const
|
||||
{ if ( m_adder ) m_adder->Add( object , value ) ; else wxLogError( wxGetTranslation(_T("AddToPropertyCollection called w/o valid adder")) ) ;}
|
||||
{ if ( m_adder ) m_adder->Add( object , value ) ; else wxLogError( wxGetTranslation(wxT("AddToPropertyCollection called w/o valid adder")) ) ;}
|
||||
|
||||
// Getting a collection property
|
||||
virtual void GetPropertyCollection( const wxObject *obj, wxxVariantArray &result) const
|
||||
{ if ( m_collectionGetter ) m_collectionGetter->Get( obj , result) ; else wxLogError( wxGetTranslation(_T("GetPropertyCollection called w/o valid collection getter")) ) ;}
|
||||
{ if ( m_collectionGetter ) m_collectionGetter->Get( obj , result) ; else wxLogError( wxGetTranslation(wxT("GetPropertyCollection called w/o valid collection getter")) ) ;}
|
||||
|
||||
virtual bool HasSetter() const { return m_setter != NULL ; }
|
||||
virtual bool HasCollectionGetter() const { return m_collectionGetter != NULL ; }
|
||||
@@ -904,11 +904,11 @@ public :
|
||||
|
||||
// Adding an element to a collection property
|
||||
virtual void AddToPropertyCollection(wxObject *WXUNUSED(object), const wxxVariant &WXUNUSED(value)) const
|
||||
{ wxLogError( wxGetTranslation(_T("AddToPropertyCollection called on a generic accessor")) ) ;}
|
||||
{ wxLogError( wxGetTranslation(wxT("AddToPropertyCollection called on a generic accessor")) ) ;}
|
||||
|
||||
// Getting a collection property
|
||||
virtual void GetPropertyCollection( const wxObject *WXUNUSED(obj), wxxVariantArray &WXUNUSED(result)) const
|
||||
{ wxLogError ( wxGetTranslation(_T("GetPropertyCollection called on a generic accessor")) ) ;}
|
||||
{ wxLogError ( wxGetTranslation(wxT("GetPropertyCollection called on a generic accessor")) ) ;}
|
||||
private :
|
||||
struct wxGenericPropertyAccessorInternal ;
|
||||
wxGenericPropertyAccessorInternal* m_data ;
|
||||
@@ -1676,7 +1676,7 @@ public:
|
||||
{
|
||||
if ( ParamCount != m_constructorPropertiesCount )
|
||||
{
|
||||
wxLogError( wxGetTranslation(_T("Illegal Parameter Count for ConstructObject Method")) ) ;
|
||||
wxLogError( wxGetTranslation(wxT("Illegal Parameter Count for ConstructObject Method")) ) ;
|
||||
return NULL ;
|
||||
}
|
||||
wxObject *object = NULL ;
|
||||
@@ -1746,7 +1746,7 @@ public:
|
||||
{
|
||||
if ( ParamCount != m_constructorPropertiesCount )
|
||||
{
|
||||
wxLogError( wxGetTranslation(_T("Illegal Parameter Count for Create Method")) ) ;
|
||||
wxLogError( wxGetTranslation(wxT("Illegal Parameter Count for Create Method")) ) ;
|
||||
return ;
|
||||
}
|
||||
m_constructor->Create( object , Params ) ;
|
||||
|
Reference in New Issue
Block a user