Update of /cvsroot/mahogany/M/src/wx/common
In directory sc8-pr-cvs1:/tmp/cvs-serv6042/src/wx/common
Modified Files:
vcard.cpp
Log Message:
unicode fixes
Index: vcard.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/wx/common/vcard.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -b -u -2 -r1.12 -r1.13
--- vcard.cpp 15 Sep 2003 17:01:43 -0000 1.12
+++ vcard.cpp 12 Oct 2003 22:03:37 -0000 1.13
@@ -45,5 +45,5 @@
// - required by vcard parser:
extern "C" {
-void Parse_Debug(const char * WXUNUSED_UNLESS_DEBUG(s))
+void Parse_Debug(const wxChar * WXUNUSED_UNLESS_DEBUG(s))
{
#ifdef DEBUG
@@ -95,5 +95,5 @@
if ( parent )
{
- m_vObj = addProp(parent->m_vObj, name);
+ m_vObj = addProp(parent->m_vObj, wxConvertWX2MB(name));
}
else
@@ -121,6 +121,8 @@
{
wxArrayCards vcards;
+ char *filename1 = new char[strlen(filename.fn_str())+1];
+ strcpy(filename1, filename.fn_str());
- VObject *vObj = Parse_MIME_FromFileName((char *)filename.mb_str());
+ VObject *vObj = Parse_MIME_FromFileName(filename1);
if ( !vObj )
{
@@ -132,5 +134,5 @@
while ( vObj )
{
- if ( wxStricmp(vObjectName(vObj), VCCardProp) == 0 )
+ if ( stricmp(vObjectName(vObj), VCCardProp) == 0 )
{
vcards.Add(new wxVCard(vObj));
@@ -141,5 +143,5 @@
}
}
-
+ delete [] filename1;
return vcards;
}
@@ -172,5 +174,5 @@
wxString wxVCardObject::GetName() const
{
- return vObjectName(m_vObj);
+ return wxConvertMB2WX(vObjectName(m_vObj));
}
@@ -183,5 +185,5 @@
void wxVCardObject::SetValue(const wxString& val)
{
- setVObjectStringZValue(m_vObj, val);
+ setVObjectStringZValue(m_vObj, wxConvertWX2MB(val));
}
@@ -215,5 +217,5 @@
char *s = fakeCString(vObjectUStringZValue(m_vObj));
- *val = s;
+ *val = wxConvertMB2WX(s);
deleteStr(s);
#endif // 0/1
@@ -245,5 +247,5 @@
{
wxString value;
- wxVCardObject *vcObj = GetProperty(name);
+ wxVCardObject *vcObj = GetProperty(wxConvertMB2WX(name));
if ( vcObj )
{
@@ -299,5 +301,5 @@
wxVCardObject *wxVCardObject::GetProperty(const wxString& name) const
{
- VObject *vObj = isAPropertyOf(m_vObj, name);
+ VObject *vObj = isAPropertyOf(m_vObj, wxConvertWX2MB(name));
return vObj ? new wxVCardObject(vObj) : NULL;
@@ -326,5 +328,5 @@
{
VObject *vObj = nextVObject(iter);
- if ( wxStricmp(vObjectName(vObj), name) == 0 )
+ if ( stricmp(vObjectName(vObj), name) == 0 )
{
// found one with correct name
@@ -418,5 +420,5 @@
wxString *nameSuffix) const
{
- wxVCardObject *vcobjName = GetProperty(VCNameProp);
+ wxVCardObject *vcobjName = GetProperty(wxConvertMB2WX(VCNameProp));
if ( !vcobjName )
return FALSE;
@@ -438,5 +440,5 @@
bool wxVCard::GetOrganization(wxString *name, wxString *unit) const
{
- wxVCardObject *vcobjOrg = GetProperty(VCOrgProp);
+ wxVCardObject *vcobjOrg = GetProperty(wxConvertMB2WX(VCOrgProp));
if ( !vcobjOrg )
return FALSE;
@@ -474,10 +476,10 @@
void wxVCardObject::AddProperty(const wxString& name)
{
- (void)addProp(m_vObj, name);
+ (void)addProp(m_vObj, wxConvertWX2MB(name));
}
void wxVCardObject::AddProperty(const wxString& name, const wxString& value)
{
- VObject *vObj = addPropValue(m_vObj, name, value);
+ VObject *vObj = addPropValue(m_vObj, wxConvertWX2MB(name), wxConvertWX2MB(value));
// mark multiline properties as being encoded in QP
@@ -490,5 +492,5 @@
void wxVCardObject::SetProperty(const wxString& name, const wxString& value)
{
- VObject *vObj = isAPropertyOf(m_vObj, name);
+ VObject *vObj = isAPropertyOf(m_vObj, wxConvertWX2MB(name));
if ( vObj )
{
@@ -503,5 +505,5 @@
bool wxVCardObject::DeleteProperty(const wxString& name)
{
- VObject *vObj = isAPropertyOf(m_vObj, name);
+ VObject *vObj = isAPropertyOf(m_vObj, wxConvertWX2MB(name));
if ( !vObj )
return FALSE;
@@ -517,20 +519,20 @@
void wxVCard::ClearAddresses()
{
- ClearAllProps(VCAdrProp);
+ ClearAllProps(wxConvertMB2WX(VCAdrProp));
}
void wxVCard::ClearAddressLabels()
{
- ClearAllProps(VCDeliveryLabelProp);
+ ClearAllProps(wxConvertMB2WX(VCDeliveryLabelProp));
}
void wxVCard::ClearPhoneNumbers()
{
- ClearAllProps(VCTelephoneProp);
+ ClearAllProps(wxConvertMB2WX(VCTelephoneProp));
}
void wxVCard::ClearEMails()
{
- ClearAllProps(VCEmailAddressProp);
+ ClearAllProps(wxConvertMB2WX(VCEmailAddressProp));
}
@@ -547,5 +549,5 @@
void wxVCard::SetFullName(const wxString& fullName)
{
- SetProperty(VCFullNameProp, fullName);
+ SetProperty(wxConvertMB2WX(VCFullNameProp), fullName);
}
@@ -561,23 +563,23 @@
if ( !!familyName )
- addPropValue(prop, VCFamilyNameProp, familyName);
+ addPropValue(prop, VCFamilyNameProp, wxConvertWX2MB(familyName));
if ( !!givenName )
- addPropValue(prop, VCGivenNameProp, givenName);
+ addPropValue(prop, VCGivenNameProp, wxConvertWX2MB(givenName));
if ( !!additionalNames )
- addPropValue(prop, VCAdditionalNamesProp, additionalNames);
+ addPropValue(prop, VCAdditionalNamesProp, wxConvertWX2MB(additionalNames));
if ( !!namePrefix )
- addPropValue(prop, VCNamePrefixesProp, namePrefix);
+ addPropValue(prop, VCNamePrefixesProp, wxConvertWX2MB(namePrefix));
if ( !!nameSuffix )
- addPropValue(prop, VCNameSuffixesProp, nameSuffix);
+ addPropValue(prop, VCNameSuffixesProp, wxConvertWX2MB(nameSuffix));
}
void wxVCard::SetTitle(const wxString& title)
{
- SetProperty(VCTitleProp, title);
+ SetProperty(wxConvertMB2WX(VCTitleProp), title);
}
void wxVCard::SetBusinessRole(const wxString& role)
{
- SetProperty(VCBusinessRoleProp, role);
+ SetProperty(wxConvertMB2WX(VCBusinessRoleProp), role);
}
@@ -590,27 +592,27 @@
if ( !!name )
- addPropValue(prop, VCOrgNameProp, name);
+ addPropValue(prop, VCOrgNameProp, wxConvertWX2MB(name));
if ( !!unit )
- addPropValue(prop, VCOrgUnitProp, unit);
+ addPropValue(prop, VCOrgUnitProp, wxConvertWX2MB(unit));
}
void wxVCard::SetComment(const wxString& comment)
{
- SetProperty(VCCommentProp, comment);
+ SetProperty(wxConvertMB2WX(VCCommentProp), comment);
}
void wxVCard::SetURL(const wxString& url)
{
- SetProperty(VCURLProp, url);
+ SetProperty(wxConvertMB2WX(VCURLProp), url);
}
void wxVCard::SetUID(const wxString& uid)
{
- SetProperty(VCUniqueStringProp, uid);
+ SetProperty(wxConvertMB2WX(VCUniqueStringProp), uid);
}
void wxVCard::SetVersion(const wxString& version)
{
- SetProperty(VCVersionProp, version);
+ SetProperty(wxConvertMB2WX(VCVersionProp), version);
}
@@ -621,5 +623,5 @@
void wxVCard::SetBirthDay(const wxDateTime& datetime)
{
- SetProperty(VCBirthDateProp, datetime.FormatISODate());
+ SetProperty(wxConvertMB2WX(VCBirthDateProp), datetime.FormatISODate());
}
@@ -635,17 +637,17 @@
VObject *vObj = addProp(m_vObj, VCAdrProp);
if ( !!postoffice )
- addPropValue(vObj, VCPostalBoxProp, postoffice);
+ addPropValue(vObj, VCPostalBoxProp, wxConvertWX2MB(postoffice));
if ( !!extaddr )
- addPropValue(vObj, VCExtAddressProp, extaddr);
+ addPropValue(vObj, VCExtAddressProp, wxConvertWX2MB(extaddr));
if ( !!street )
- addPropValue(vObj, VCStreetAddressProp, street);
+ addPropValue(vObj, VCStreetAddressProp, wxConvertWX2MB(street));
if ( !!city )
- addPropValue(vObj, VCCityProp, city);
+ addPropValue(vObj, VCCityProp, wxConvertWX2MB(city));
if ( !!region )
- addPropValue(vObj, VCRegionProp, region);
+ addPropValue(vObj, VCRegionProp, wxConvertWX2MB(region));
if ( !!postalcode )
- addPropValue(vObj, VCPostalCodeProp, postalcode);
+ addPropValue(vObj, VCPostalCodeProp, wxConvertWX2MB(postalcode));
if ( !!country )
- addPropValue(vObj, VCCountryNameProp, country);
+ addPropValue(vObj, VCCountryNameProp, wxConvertWX2MB(country));
wxVCardAddrOrLabel::SetFlags(vObj, flags);
@@ -654,5 +656,5 @@
void wxVCard::AddAddressLabel(const wxString& label, int flags)
{
- VObject *vObj = addPropValue(m_vObj, VCDeliveryLabelProp, label);
+ VObject *vObj = addPropValue(m_vObj, VCDeliveryLabelProp, wxConvertWX2MB(label));
addProp(vObj, VCQuotedPrintableProp);
@@ -662,5 +664,5 @@
void wxVCard::AddPhoneNumber(const wxString& phone, int flags)
{
- VObject *vObj = addPropValue(m_vObj, VCTelephoneProp, phone);
+ VObject *vObj = addPropValue(m_vObj, VCTelephoneProp, wxConvertWX2MB(phone));
wxVCardPhoneNumber::SetFlags(vObj, flags);
@@ -671,5 +673,5 @@
wxVCardEMail::Type WXUNUSED_UNLESS_DEBUG(type))
{
- addPropValue(m_vObj, VCEmailAddressProp, email);
+ addPropValue(m_vObj, VCEmailAddressProp, wxConvertWX2MB(email));
wxASSERT_MSG( type == wxVCardEMail::Internet,
@@ -685,5 +687,5 @@
{
char* p = writeMemVObject(NULL, 0, m_vObj);
- wxString s = p;
+ wxString s = wxConvertMB2WX(p);
free(p);
@@ -694,6 +696,10 @@
bool wxVCardObject::Write(const wxString& filename) const
{
- writeVObjectToFile((char *)filename.mb_str(), m_vObj);
+ char *filename1 = new char[strlen(filename.fn_str())+1];
+ strcpy(filename1, filename.fn_str());
+
+ writeVObjectToFile(filename1, m_vObj);
+ delete [] filename1;
return TRUE; // writeVObjectToFile() is void @[EMAIL PROTECTED]@!!
}
@@ -702,6 +708,10 @@
void wxVCardObject::Dump(const wxString& filename)
{
+ char *filename1 = new char[strlen(filename.fn_str())+1];
+ strcpy(filename1, filename.fn_str());
+
// it is ok for m_vObj to be NULL
- printVObjectToFile((char *)filename.mb_str(), m_vObj);
+ printVObjectToFile(filename1, m_vObj);
+ delete [] filename1;
}
@@ -713,5 +723,5 @@
// have local variables like in wxVCardAddrOrLabel::GetFlags() below
#define CHECK_FLAG(propname, flag) \
- prop = GetProperty(propname); \
+ prop = GetProperty(wxConvertMB2WX(propname)); \
if ( prop ) \
{ \
@@ -769,5 +779,5 @@
: wxVCardAddrOrLabel(vObj)
{
- wxASSERT_MSG( GetName() == VCAdrProp, _T("this is not a vCard address") );
+ wxASSERT_MSG( GetName() == wxConvertMB2WX(VCAdrProp), _T("this is not a vCard
address") );
}
@@ -787,35 +797,35 @@
wxString wxVCardAddress::GetPostOffice() const
{
- return GetPropValue(VCPostalBoxProp);
+ return GetPropValue(wxConvertMB2WX(VCPostalBoxProp));
}
wxString wxVCardAddress::GetExtAddress() const
{
- return GetPropValue(VCExtAddressProp);
+ return GetPropValue(wxConvertMB2WX(VCExtAddressProp));
}
wxString wxVCardAddress::GetStreet() const
{
- return GetPropValue(VCStreetAddressProp);
+ return GetPropValue(wxConvertMB2WX(VCStreetAddressProp));
}
wxString wxVCardAddress::GetLocality() const
{
- return GetPropValue(VCCityProp);
+ return GetPropValue(wxConvertMB2WX(VCCityProp));
}
wxString wxVCardAddress::GetRegion() const
{
- return GetPropValue(VCRegionProp);
+ return GetPropValue(wxConvertMB2WX(VCRegionProp));
}
wxString wxVCardAddress::GetPostalCode() const
{
- return GetPropValue(VCPostalCodeProp);
+ return GetPropValue(wxConvertMB2WX(VCPostalCodeProp));
}
wxString wxVCardAddress::GetCountry() const
{
- return GetPropValue(VCCountryNameProp);
+ return GetPropValue(wxConvertMB2WX(VCCountryNameProp));
}
@@ -827,5 +837,5 @@
: wxVCardAddrOrLabel(vObj)
{
- wxASSERT_MSG( GetName() == VCDeliveryLabelProp,
+ wxASSERT_MSG( GetName() == wxConvertMB2WX(VCDeliveryLabelProp),
_T("this is not a vCard address label") );
}
@@ -838,5 +848,5 @@
: wxVCardObject(vObj)
{
- wxASSERT_MSG( GetName() == VCTelephoneProp,
+ wxASSERT_MSG( GetName() == wxConvertMB2WX(VCTelephoneProp),
_T("this is not a vCard telephone number") );
}
@@ -894,5 +904,5 @@
: wxVCardObject(vObj)
{
- wxASSERT_MSG( GetName() == VCEmailAddressProp,
+ wxASSERT_MSG( GetName() == wxConvertMB2WX(VCEmailAddressProp),
_T("this is not a vCard email address") );
}
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
SourceForge.net hosts over 70,000 Open Source Projects.
See the people who have HELPED US provide better services:
Click here: http://sourceforge.net/supporters.php
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
