Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Borland fixes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31102 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-12-21 16:41:55 +00:00
parent e2bcbdfbc7
commit 1296186133
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/xti.h
View File

@@ -390,8 +390,8 @@ public :
} }
#if wxUSE_UNICODE #if wxUSE_UNICODE
wxTypeInfo(wxTypeKind kind, wxTypeInfo(wxTypeKind kind,
converterToString_t to = NULL, converterFromString_t from = NULL, converterToString_t to, converterFromString_t from,
const char *name = ""): const char *name):
m_toString(to), m_fromString(from), m_kind(kind), m_name(wxString::FromAscii(name)) m_toString(to), m_fromString(from), m_kind(kind), m_name(wxString::FromAscii(name))
{ {
Register(); Register();
@@ -626,10 +626,10 @@ class WXDLLIMPEXP_BASE wxxVariant
{ {
public : public :
wxxVariant() { m_data = NULL ; } 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) {} m_data(new wxxVariantDataT<T>(data) ), m_name(name) {}
~wxxVariant() { delete m_data ; } ~wxxVariant() { delete m_data ; }