From 1296186133b677fdbaddfc1551b2b2c7321dac39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?W=C5=82odzimierz=20Skiba?= Date: Tue, 21 Dec 2004 16:41:55 +0000 Subject: [PATCH] Borland fixes. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31102 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/xti.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wx/xti.h b/include/wx/xti.h index 3c8688147f..8137aa64a8 100644 --- a/include/wx/xti.h +++ b/include/wx/xti.h @@ -390,8 +390,8 @@ public : } #if wxUSE_UNICODE wxTypeInfo(wxTypeKind kind, - converterToString_t to = NULL, converterFromString_t from = NULL, - const char *name = ""): + converterToString_t to, converterFromString_t from, + const char *name): m_toString(to), m_fromString(from), m_kind(kind), m_name(wxString::FromAscii(name)) { Register(); @@ -626,10 +626,10 @@ class WXDLLIMPEXP_BASE wxxVariant { public : wxxVariant() { m_data = NULL ; } - wxxVariant( wxxVariantData* data , const wxString& name = wxT("") ) : m_data(data) , m_name(name) {} + wxxVariant( wxxVariantData* data , const wxString& name = wxEmptyString ) : m_data(data) , m_name(name) {} wxxVariant( const wxxVariant &d ) { if ( d.m_data ) m_data = d.m_data->Clone() ; else m_data = NULL ; m_name = d.m_name ; } - template wxxVariant( const T& data , const wxString& name = wxT("") ) : + template wxxVariant( const T& data , const wxString& name = wxEmptyString ) : m_data(new wxxVariantDataT(data) ), m_name(name) {} ~wxxVariant() { delete m_data ; }