Borland fixes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31102 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/xti.h b/include/wx/xti.h
index 3c8688147f3bd18a6e49a28aa3fd5cf5cce9dd18..8137aa64a80eb5a138c185db44ae7493d5e0eb2a 100644 (file)
--- a/include/wx/xti.h
+++ b/include/wx/xti.h
@@ -390,8 +390,8 @@ public :
     }
 #if wxUSE_UNICODE
     wxTypeInfo(wxTypeKind kind,
     }
 #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();
             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 ; }
 {
 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 ; }
 
     wxxVariant( const wxxVariant &d ) { if ( d.m_data ) m_data = d.m_data->Clone() ; else m_data = NULL ; m_name = d.m_name ; }
 

-    template<typename T> wxxVariant( const T& data , const wxString& name = wxT("") ) :
+    template<typename T> wxxVariant( const T& data , const wxString& name = wxEmptyString ) :

     m_data(new wxxVariantDataT<T>(data) ), m_name(name) {}
 
     ~wxxVariant() { delete m_data ; }
     m_data(new wxxVariantDataT<T>(data) ), m_name(name) {}
 
     ~wxxVariant() { delete m_data ; }