Use wxGetTranslation() instead of _() in the public headers.
This allows the code in them to compile even when WXINTL_NO_GETTEXT_MACRO is defined. Closes #15443. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74812 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -176,7 +176,7 @@ public:
|
||||
if ( m_setter )
|
||||
m_setter->Set( object, value );
|
||||
else
|
||||
wxLogError( _("SetProperty called w/o valid setter") );
|
||||
wxLogError( wxGetTranslation("SetProperty called w/o valid setter") );
|
||||
}
|
||||
|
||||
// Getting a simple property (non-collection)
|
||||
@@ -185,7 +185,7 @@ public:
|
||||
if ( m_getter )
|
||||
m_getter->Get( object, result );
|
||||
else
|
||||
wxLogError( _("GetProperty called w/o valid getter") );
|
||||
wxLogError( wxGetTranslation("GetProperty called w/o valid getter") );
|
||||
}
|
||||
|
||||
// Adding an element to a collection property
|
||||
@@ -194,7 +194,7 @@ public:
|
||||
if ( m_adder )
|
||||
m_adder->Add( object, value );
|
||||
else
|
||||
wxLogError( _("AddToPropertyCollection called w/o valid adder") );
|
||||
wxLogError( wxGetTranslation("AddToPropertyCollection called w/o valid adder") );
|
||||
}
|
||||
|
||||
// Getting a collection property
|
||||
@@ -203,7 +203,7 @@ public:
|
||||
if ( m_collectionGetter )
|
||||
m_collectionGetter->Get( obj, result);
|
||||
else
|
||||
wxLogError( _("GetPropertyCollection called w/o valid collection getter") );
|
||||
wxLogError( wxGetTranslation("GetPropertyCollection called w/o valid collection getter") );
|
||||
}
|
||||
|
||||
virtual bool HasSetter() const { return m_setter != NULL; }
|
||||
@@ -256,14 +256,14 @@ public:
|
||||
virtual void AddToPropertyCollection(wxObject *WXUNUSED(object),
|
||||
const wxAny &WXUNUSED(value)) const
|
||||
{
|
||||
wxLogError( _("AddToPropertyCollection called on a generic accessor") );
|
||||
wxLogError( wxGetTranslation("AddToPropertyCollection called on a generic accessor") );
|
||||
}
|
||||
|
||||
// Getting a collection property
|
||||
virtual void GetPropertyCollection( const wxObject *WXUNUSED(obj),
|
||||
wxAnyList &WXUNUSED(result)) const
|
||||
{
|
||||
wxLogError ( _("GetPropertyCollection called on a generic accessor") );
|
||||
wxLogError ( wxGetTranslation("GetPropertyCollection called on a generic accessor") );
|
||||
}
|
||||
|
||||
private:
|
||||
|
Reference in New Issue
Block a user