Update of /cvsroot/mahogany/M/src/classes
In directory sc8-pr-cvs1:/tmp/cvs-serv3286/src/classes
Modified Files:
MFolder.cpp MModule.cpp MObject.cpp MessageView.cpp
Moptions.cpp Mpers.cpp PathFinder.cpp
Log Message:
unicode fixes
Index: MFolder.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/MFolder.cpp,v
retrieving revision 1.102
retrieving revision 1.103
diff -b -u -2 -r1.102 -r1.103
--- MFolder.cpp 30 Sep 2003 13:46:19 -0000 1.102
+++ MFolder.cpp 11 Oct 2003 17:02:37 -0000 1.103
@@ -91,5 +91,5 @@
static String GetClassForType(MFolderType type)
{
- return type == MF_VIRTUAL ? "virtual" : "cclient";
+ return type == MF_VIRTUAL ? _T("virtual") : _T("cclient");
}
@@ -192,5 +192,5 @@
virtual void SetIcon(int /* icon */) { }
- virtual String GetComment() const { return ""; }
+ virtual String GetComment() const { return _T(""); }
virtual void SetComment(const String& /* comment */) { }
@@ -389,5 +389,5 @@
public:
// ctor
- MRootFolderFromProfile() : MFolderFromProfile("")
+ MRootFolderFromProfile() : MFolderFromProfile(_T(""))
{
}
@@ -407,5 +407,5 @@
{ FAIL_MSG(_T("doesn't make sense for root folder")); }
- virtual String GetComment() const { return ""; }
+ virtual String GetComment() const { return _T(""); }
virtual void SetComment(const String& /* comment */)
{ FAIL_MSG(_T("can not set root folder attributes.")); }
@@ -634,5 +634,5 @@
{
String str = MObjectRC::DebugDump();
- str << "name '" << GetFullName() << '\'';
+ str << _T("name '") << GetFullName() << _T('\'');
return str;
@@ -655,5 +655,5 @@
bool MFolderFromProfile::Exists(const String& fullname)
{
- Profile_obj profile("");
+ Profile_obj profile(_T(""));
return profile->HasGroup(fullname);
@@ -673,5 +673,5 @@
String path, component;
- Profile *profile = Profile::CreateFolderProfile("");
+ Profile *profile = Profile::CreateFolderProfile(_T(""));
size_t n,
@@ -685,5 +685,5 @@
if ( !updatedCount )
{
- if ( profile->readEntryFromHere(component + '/' + MP_FOLDER_TYPE,
+ if ( profile->readEntryFromHere(component + _T('/') + MP_FOLDER_TYPE,
MF_ILLEGAL) == MF_ILLEGAL )
{
@@ -718,5 +718,5 @@
// go down
if ( !path.empty() )
- path += '/';
+ path += _T('/');
path += components[n];
@@ -735,5 +735,5 @@
String MFolderFromProfile::GetName() const
{
- return m_folderName.AfterLast('/');
+ return m_folderName.AfterLast(_T('/'));
}
@@ -747,5 +747,5 @@
// the filename (it is also better to show it like to the user in this form)
if ( GetType() == MF_FILE )
- path.Replace("/", "\\");
+ path.Replace(_T("/"), _T("\\"));
#endif // Windows
@@ -785,5 +785,5 @@
{
// it's not used now...
- FAIL_MSG( "not implemented" );
+ FAIL_MSG( _T("not implemented") );
}
@@ -976,5 +976,5 @@
{
String others;
- if ( filters.StartsWith(filter + ':', &others) )
+ if ( filters.StartsWith(filter + _T(':'), &others) )
{
filters = others;
@@ -982,5 +982,5 @@
else
{
- const char *start = strstr(filters, ':' + filter);
+ const wxChar *start = wxStrstr(filters, _T(':') + filter);
if ( !start )
{
@@ -1041,5 +1041,5 @@
MFolder *MFolderFromProfile::GetParent() const
{
- String path = m_folderName.BeforeLast('/');
+ String path = m_folderName.BeforeLast(_T('/'));
return Get(path);
}
@@ -1066,5 +1066,5 @@
// is it our immediate child?
- if ( subfolder && name.find('/') == String::npos )
+ if ( subfolder && name.find(_T('/')) == String::npos )
{
// we must update the children count if we had already calculated it
@@ -1119,10 +1119,10 @@
CHECK( !m_folderName.empty(), false, _T("can't rename the root pseudo-folder") );
- String path = m_folderName.BeforeLast('/'),
- name = m_folderName.AfterLast('/');
+ String path = m_folderName.BeforeLast(_T('/')),
+ name = m_folderName.AfterLast(_T('/'));
String newFullName = path;
if ( !path.empty() )
- newFullName += '/';
+ newFullName += _T('/');
newFullName += newName;
@@ -1199,5 +1199,5 @@
String newFullName = path;
if ( !path.empty() )
- newFullName += '/';
+ newFullName += _T('/');
newFullName += name;
@@ -1380,5 +1380,5 @@
wxString rootName(start);
if ( !rootName.empty() )
- rootName += '/';
+ rootName += _T('/');
//else: there should be no leading slash
@@ -1431,5 +1431,5 @@
if ( parent && parent->GetType() != MF_ROOT )
{
- fullname << parent->GetFullName() << '/';
+ fullname << parent->GetFullName() << _T('/');
}
fullname << name;
@@ -1472,5 +1472,5 @@
{
// yes, now check if we're INBOX
- if ( path.empty() || !wxStricmp(path, "INBOX") )
+ if ( path.empty() || !wxStricmp(path, _T("INBOX")) )
{
// INBOX created, so disable the parent
@@ -1508,5 +1508,5 @@
// create folders for all files in this dir
wxString filename;
- bool cont = dir.GetFirst(&filename, "", wxDIR_FILES);
+ bool cont = dir.GetFirst(&filename, _T(""), wxDIR_FILES);
while ( cont )
{
@@ -1538,5 +1538,5 @@
// and recursively call us for each subdir
wxString dirname;
- cont = dir.GetFirst(&dirname, "", wxDIR_DIRS);
+ cont = dir.GetFirst(&dirname, _T(""), wxDIR_DIRS);
while ( cont )
{
Index: MModule.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/MModule.cpp,v
retrieving revision 1.85
retrieving revision 1.86
diff -b -u -2 -r1.85 -r1.86
--- MModule.cpp 3 Oct 2003 17:08:05 -0000 1.85
+++ MModule.cpp 11 Oct 2003 17:02:37 -0000 1.86
@@ -66,5 +66,5 @@
// the trace mask used by module loading code
-#define M_TRACE_MODULES "mmodule"
+#define M_TRACE_MODULES _T("mmodule")
// ----------------------------------------------------------------------------
@@ -220,8 +220,8 @@
#ifdef USE_MODULES_STATIC
extern
-void MModule_AddStaticModule(const char *Name,
- const char *Interface,
- const char *Description,
- const char *Version,
+void MModule_AddStaticModule(const wxChar *Name,
+ const wxChar *Interface,
+ const wxChar *Description,
+ const wxChar *Version,
MModule_InitModuleFuncType initFunc)
{
@@ -405,10 +405,10 @@
return m_Module;
}
- MModuleListingEntryImpl(const String &name = "",
- const String &interfaceName = "",
- const String &shortdesc = "",
- const String &desc = "",
- const String &version = "",
- const String &author = "",
+ MModuleListingEntryImpl(const String &name = _T(""),
+ const String &interfaceName = _T(""),
+ const String &shortdesc = _T(""),
+ const String &desc = _T(""),
+ const String &version = _T(""),
+ const String &author = _T(""),
MModule *module = NULL)
{
@@ -496,5 +496,5 @@
// well depending on the parameters values, so the name is a bit unfortunate
static MModuleListing * DoListLoadedModules(bool listall = false,
- const String& interfaceName = "",
+ const String& interfaceName = _T(""),
bool loadableOnly = false)
{
@@ -529,7 +529,7 @@
me->m_Interface,
desc,
- "", // long description
+ _T(""), // long description
String(me->m_Version) + _(" (builtin)"),
- "[EMAIL PROTECTED]",
+ _T("[EMAIL PROTECTED]"),
me->m_Module
);
@@ -558,7 +558,7 @@
m->GetInterface(),
desc,
- "", // long description
+ _T(""), // long description
m->GetVersion(),
- "", // author
+ _T(""), // author
m
);
@@ -585,5 +585,5 @@
MModule::ListLoadableModules()
{
- return ListAvailableModules("", true /* loadable only */);
+ return ListAvailableModules(_T(""), true /* loadable only */);
}
@@ -629,5 +629,5 @@
{
// first look for MMDs
- pathname << "*.mmd";
+ pathname << _T("*.mmd");
filename = wxFindFirstFile(pathname);
while( filename.length() )
@@ -675,11 +675,11 @@
};
- static const char *MMD_HEADERS[] =
+ static const wxChar *MMD_HEADERS[] =
{
MMD_SIGNATURE,
- "Name:",
- "Interface:",
- "Version:",
- "Author:",
+ _T("Name:"),
+ _T("Interface:"),
+ _T("Version:"),
+ _T("Author:"),
};
@@ -698,5 +698,5 @@
// it's either a .mmd file in which case we just read its contents or a
// .so file in which case we load it and call its GetMModuleInfo()
- if ( filename.Right(4) == ".mmd" )
+ if ( filename.Right(4) == _T(".mmd") )
{
errorflag = false;
@@ -734,5 +734,5 @@
String description;
for(size_t l = MMD_LINE_LAST + 1; l < tf.GetLineCount(); l++)
- description << tf[l] << '\n';
+ description << tf[l] << _T('\n');
String name;
@@ -897,9 +897,9 @@
// ----------------------------------------------------------------------------
-const char *GetMModuleProperty(const ModuleProperty *table, const char *name)
+const wxChar *GetMModuleProperty(const ModuleProperty *table, const wxChar *name)
{
while ( table->name )
{
- if ( strcmp(table->name, name) == 0 )
+ if ( wxStrcmp(table->name, name) == 0 )
return table->value;
@@ -907,5 +907,5 @@
}
- return "";
+ return _T("");
}
Index: MObject.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/MObject.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -b -u -2 -r1.28 -r1.29
--- MObject.cpp 9 Oct 2003 16:39:09 -0000 1.28
+++ MObject.cpp 11 Oct 2003 17:02:37 -0000 1.29
@@ -72,5 +72,5 @@
String MObjectRC::DebugDump() const
{
- return MObject::DebugDump() + String::Format(" m_nRef = %lu: ", (unsigned
long)m_nRef);
+ return MObject::DebugDump() + String::Format(_T(" m_nRef = %lu: "), (unsigned
long)m_nRef);
}
@@ -84,5 +84,5 @@
MOcheck();
String str;
- str.Printf("%s at %p", DebugGetClassName(), this);
+ str.Printf(_T("%s at %p"), DebugGetClassName(), this);
return str;
Index: MessageView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/MessageView.cpp,v
retrieving revision 1.138
retrieving revision 1.139
diff -b -u -2 -r1.138 -r1.139
--- MessageView.cpp 10 Oct 2003 21:57:06 -0000 1.138
+++ MessageView.cpp 11 Oct 2003 17:02:37 -0000 1.139
@@ -737,5 +737,5 @@
prio,
name,
- _(filterFactory->GetDescription()),
+
wxGetTranslation(filterFactory->GetDescription()),
node
);
@@ -1861,5 +1861,5 @@
else
{
- String s((const char *)data, len);
+ String s((const wxChar *)data, len);
m_viewer->InsertRawContents(s);
@@ -1939,5 +1939,5 @@
if ( mimepart->GetParam(_T("protocol")) == _T("application/pgp-signature") )
{
- static const char *sigIgnoredMsg =
+ static const wxChar *sigIgnoredMsg =
gettext_noop("\n\nSignature will be ignored");
@@ -1948,5 +1948,5 @@
wxLogWarning(String(_("This message pretends to be signed but "
"doesn't have the correct MIME structure.")) +
- _(sigIgnoredMsg));
+ wxGetTranslation(sigIgnoredMsg));
// still show the message contents
@@ -1968,5 +1968,5 @@
wxLogWarning(String(_("Signed message signature does not have a "
"\"application/pgp-signature\" type.")) +
- _(sigIgnoredMsg));
+ wxGetTranslation(sigIgnoredMsg));
ProcessAllNestedParts(mimepart);
@@ -2756,5 +2756,5 @@
(
filename,
- String((const char *)content, len)
+ String((const wxChar *)content, len)
);
}
@@ -3011,5 +3011,5 @@
wxFrame *frame = GetParentFrame();
CHECK_RET( frame, _T("message view without parent frame?") );
- frame->SetStatusText("");
+ frame->SetStatusText(_T(""));
}
}
Index: Moptions.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/Moptions.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -b -u -2 -r1.69 -r1.70
--- Moptions.cpp 10 Oct 2003 21:56:32 -0000 1.69
+++ Moptions.cpp 11 Oct 2003 17:02:37 -0000 1.70
@@ -37,5 +37,5 @@
struct MOptionData
{
- MOptionData(const char *name_, long val)
+ MOptionData(const wxChar *name_, long val)
{
name = name_;
@@ -44,5 +44,5 @@
}
- MOptionData(const char *name_, const char *val)
+ MOptionData(const wxChar *name_, const wxChar *val)
{
name = name_;
@@ -51,10 +51,10 @@
}
- const char *name;
+ const wxChar *name;
union
{
long n;
- const char *s;
+ const wxChar *s;
} value;
@@ -916,5 +916,5 @@
{
MOptionValue value;
- const char *name = GetOptionName(opt);
+ const wxChar *name = GetOptionName(opt);
if ( IsNumeric(opt) )
value.Set(profile->readEntry(name, GetNumericDefault(opt)));
@@ -932,5 +932,5 @@
}
-extern const char *GetOptionName(const MOption opt)
+extern const wxChar *GetOptionName(const MOption opt)
{
ASSERT_MSG( (size_t)opt.GetId() < WXSIZEOF(MOptions),
@@ -950,5 +950,5 @@
}
-extern const char *GetStringDefault(const MOption opt)
+extern const wxChar *GetStringDefault(const MOption opt)
{
return MOptions[opt.GetId()].value.s;
Index: Mpers.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/Mpers.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -b -u -2 -r1.18 -r1.19
--- Mpers.cpp 4 Oct 2003 01:48:35 -0000 1.18
+++ Mpers.cpp 11 Oct 2003 17:02:37 -0000 1.19
@@ -65,103 +65,103 @@
static const struct
{
- const char *name;
- const char *desc;
+ const wxChar *name;
+ const wxChar *desc;
} gs_persMsgBoxData[] =
{
- { "AskSpecifyDir", gettext_noop("prompt for global directory if not
found") },
+ { _T("AskSpecifyDir"), gettext_noop("prompt for global directory if not
found") },
#ifdef OS_UNIX
- { "AskRunAsRoot", gettext_noop("warn if Mahogany is run as root") },
+ { _T("AskRunAsRoot"), gettext_noop("warn if Mahogany is run as root")
},
#endif // OS_UNIX
- { "SendOutboxOnExit", gettext_noop("send unsent messages on exit") },
- { "AbandonCriticalFolders", gettext_noop("prompt before abandoning critical
folders ") },
- { "GoOnlineToSendOutbox", gettext_noop("go online to send Outbox") },
- { "FixTemplate", gettext_noop("propose to fix template with errors")
},
- { "AskForSig", gettext_noop("ask for signature if none found") },
- { "AskSaveHeaders", gettext_noop("ask for confirmation before closing if
the headers were modified in the composer") },
- { "MessageSent", gettext_noop("show notification after sending the
message") },
- { "AskForExtEdit", gettext_noop("propose to change external editor
settings if unset") },
- { "MimeTypeCorrect", gettext_noop("ask confirmation for guessed MIME
types") },
- { "ConfigNetFromCompose", gettext_noop("propose to configure network settings
before sending the message if necessary") },
- { "SendemptySubject", gettext_noop("confirm sending a message without
subject") },
- { "ConfirmFolderDelete", gettext_noop("confirm removing folder from the
folder tree") },
- { "ConfirmFolderPhysDelete", gettext_noop("confirm before deleting folder with
its contents") },
- { "MarkRead", gettext_noop("mark all articles as read before
closing the folder") },
+ { _T("SendOutboxOnExit"), gettext_noop("send unsent messages on exit") },
+ { _T("AbandonCriticalFolders"), gettext_noop("prompt before abandoning critical
folders ") },
+ { _T("GoOnlineToSendOutbox"), gettext_noop("go online to send Outbox") },
+ { _T("FixTemplate"), gettext_noop("propose to fix template with
errors") },
+ { _T("AskForSig"), gettext_noop("ask for signature if none found")
},
+ { _T("AskSaveHeaders"), gettext_noop("ask for confirmation before
closing if the headers were modified in the composer") },
+ { _T("MessageSent"), gettext_noop("show notification after sending
the message") },
+ { _T("AskForExtEdit"), gettext_noop("propose to change external editor
settings if unset") },
+ { _T("MimeTypeCorrect"), gettext_noop("ask confirmation for guessed MIME
types") },
+ { _T("ConfigNetFromCompose"), gettext_noop("propose to configure network
settings before sending the message if necessary") },
+ { _T("SendemptySubject"), gettext_noop("confirm sending a message without
subject") },
+ { _T("ConfirmFolderDelete"), gettext_noop("confirm removing folder from the
folder tree") },
+ { _T("ConfirmFolderPhysDelete"), gettext_noop("confirm before deleting folder
with its contents") },
+ { _T("MarkRead"), gettext_noop("mark all articles as read before
closing the folder") },
#ifdef USE_DIALUP
- { "DialUpConnectedMsg", gettext_noop("show notification on dial-up network
connection") },
- { "DialUpDisconnectedMsg", gettext_noop("show notification on dial-up network
disconnection") },
- { "DialUpOnOpenFolder", gettext_noop("propose to start dial up networking
before trying to open a remote folder") },
- { "NetDownOpenAnyway", gettext_noop("warn before opening remote folder
while not being online") },
- { "NoNetPingAnyway", gettext_noop("ping remote folders even while
offline") },
+ { _T("DialUpConnectedMsg"), gettext_noop("show notification on dial-up
network connection") },
+ { _T("DialUpDisconnectedMsg"), gettext_noop("show notification on dial-up
network disconnection") },
+ { _T("DialUpOnOpenFolder"), gettext_noop("propose to start dial up
networking before trying to open a remote folder") },
+ { _T("NetDownOpenAnyway"), gettext_noop("warn before opening remote folder
while not being online") },
+ { _T("NoNetPingAnyway"), gettext_noop("ping remote folders even while
offline") },
#endif // USE_DIALUP
// "ConfirmExit" mist be same as MP_CONFIRMEXIT_NAME!
- { "ConfirmExit", gettext_noop("don't ask confirmation before exiting
the program") },
- { "AskLogin", gettext_noop("ask for the login name when creating
the folder if required") },
- { "AskPwd", gettext_noop("ask for the password when creating the
folder if required") },
- { "SavePwd", gettext_noop("ask confirmation before saving the
password in the file") },
- { "GoOfflineSendFirst", gettext_noop("propose to send outgoing messages
before hanging up") },
- { "OpenUnaccessibleFolder", gettext_noop("warn before trying to reopen folder
which couldn't be opened the last time") },
- { "ChangeUnaccessibleFolderSettings", gettext_noop("propose to change settings of
a folder which couldn't be opened the last time before reopening it") },
- { "AskUrlBrowser", gettext_noop("ask for the WWW browser if it was not
configured") },
- { "OptTestAsk", gettext_noop("propose to test new settings after
changing any important ones") },
- { "WarnRestartOpt", gettext_noop("warn if some options changes don't
take effect until program restart") },
- { "SaveTemplate", gettext_noop("propose to save changed template
before closing it") },
- { "DeleteTemplate", gettext_noop("ask for confirmation before deleting a
template") },
- { "MailNoNetQueuedMessage", gettext_noop("show notification if the message is
queued in Outbox and not sent out immediately") },
- { "MailQueuedMessage", gettext_noop("show notification for queued
messages") },
- { "MailSentMessage", gettext_noop("show notification for sent messages")
},
- { "TestMailSent", gettext_noop("show successful test message") },
- { "AdbDeleteEntry", gettext_noop("ask for confirmation before deleting
the address book entries") },
- { "ConfirmAdbImporter", gettext_noop("ask for confirmation before importing
unrecognized address book files") },
- { "ModulesWarning", gettext_noop("warning that module changes take
effect only after restart") },
- { "BbdbSaveDialog", gettext_noop("ask for confirmation before saving
address books in BBDB format") },
- { "FolderGroupHint", gettext_noop("show explanation after creating a
folder group") },
- { "SignatureTooLong", gettext_noop("warn if signature is longer than
netiquette recommends") },
- { "RememberPwd", gettext_noop("propose to permanently remember
passwords entered interactively") },
- { "KeepPwd", gettext_noop("propose to keep passwords entered
interactively for the duration of this session") },
- { "ShowLogWinHint", gettext_noop("show the hint about reopening the log
window when it is being closed") },
- { "AutoExpunge", gettext_noop("expunge deleted messages before
closing the folder") },
- { "SuspendAutoCollectFolder", gettext_noop("suspend auto-collecting messages from
failed incoming folder") },
+ { _T("ConfirmExit"), gettext_noop("don't ask confirmation before
exiting the program") },
+ { _T("AskLogin"), gettext_noop("ask for the login name when
creating the folder if required") },
+ { _T("AskPwd"), gettext_noop("ask for the password when creating
the folder if required") },
+ { _T("SavePwd"), gettext_noop("ask confirmation before saving the
password in the file") },
+ { _T("GoOfflineSendFirst"), gettext_noop("propose to send outgoing messages
before hanging up") },
+ { _T("OpenUnaccessibleFolder"), gettext_noop("warn before trying to reopen
folder which couldn't be opened the last time") },
+ { _T("ChangeUnaccessibleFolderSettings"), gettext_noop("propose to change settings
of a folder which couldn't be opened the last time before reopening it") },
+ { _T("AskUrlBrowser"), gettext_noop("ask for the WWW browser if it was
not configured") },
+ { _T("OptTestAsk"), gettext_noop("propose to test new settings after
changing any important ones") },
+ { _T("WarnRestartOpt"), gettext_noop("warn if some options changes don't
take effect until program restart") },
+ { _T("SaveTemplate"), gettext_noop("propose to save changed template
before closing it") },
+ { _T("DeleteTemplate"), gettext_noop("ask for confirmation before
deleting a template") },
+ { _T("MailNoNetQueuedMessage"), gettext_noop("show notification if the message
is queued in Outbox and not sent out immediately") },
+ { _T("MailQueuedMessage"), gettext_noop("show notification for queued
messages") },
+ { _T("MailSentMessage"), gettext_noop("show notification for sent
messages") },
+ { _T("TestMailSent"), gettext_noop("show successful test message") },
+ { _T("AdbDeleteEntry"), gettext_noop("ask for confirmation before
deleting the address book entries") },
+ { _T("ConfirmAdbImporter"), gettext_noop("ask for confirmation before
importing unrecognized address book files") },
+ { _T("ModulesWarning"), gettext_noop("warning that module changes take
effect only after restart") },
+ { _T("BbdbSaveDialog"), gettext_noop("ask for confirmation before saving
address books in BBDB format") },
+ { _T("FolderGroupHint"), gettext_noop("show explanation after creating a
folder group") },
+ { _T("SignatureTooLong"), gettext_noop("warn if signature is longer than
netiquette recommends") },
+ { _T("RememberPwd"), gettext_noop("propose to permanently remember
passwords entered interactively") },
+ { _T("KeepPwd"), gettext_noop("propose to keep passwords entered
interactively for the duration of this session") },
+ { _T("ShowLogWinHint"), gettext_noop("show the hint about reopening the
log window when it is being closed") },
+ { _T("AutoExpunge"), gettext_noop("expunge deleted messages before
closing the folder") },
+ { _T("SuspendAutoCollectFolder"), gettext_noop("suspend auto-collecting messages
from failed incoming folder") },
#if 0 // unused any more
- { "RulesMismatchWarn1", gettext_noop("Warning that filter rules do not match
dialog")},
- { "RulesMismatchWarn2", gettext_noop("Warning that filter rules have been
edited") },
+ { _T("RulesMismatchWarn1"), gettext_noop("Warning that filter rules do not
match dialog")},
+ { _T("RulesMismatchWarn2"), gettext_noop("Warning that filter rules have
been edited") },
#endif // 0
- { "FilterReplace", gettext_noop("ask whether to replace filter when
adding a new filter") },
- { "AddAllSubfolders", gettext_noop("create all subfolders automatically
instead of browsing them") },
+ { _T("FilterReplace"), gettext_noop("ask whether to replace filter when
adding a new filter") },
+ { _T("AddAllSubfolders"), gettext_noop("create all subfolders
automatically instead of browsing them") },
- { "StoreRemoteNow", gettext_noop("store remote configuration from
options dialog") },
- { "GetRemoteNow", gettext_noop("retrieve remote configuration from
options dialog") },
- { "OverwriteRemote", gettext_noop("ask before overwriting remote
configuration settings") },
- { "RetrieveRemote", gettext_noop("retrieve remote settings at startup")
},
- { "StoreRemote", gettext_noop("store remote settings at shutdown") },
- { "StoredRemote", gettext_noop("show confirmation after remote config
was saved") },
-
- { "ExplainGlobalPasswd", gettext_noop("show explanation before asking for
global password") },
- { "FilterNotUsedYet", gettext_noop("warn that newly created filter is
unused") },
- { "FilterOverwrite", gettext_noop("ask confirmation before overwriting a
filter with another one") },
- { "ImportUnderRoot", gettext_noop("ask where do you want to import
folders") },
- { "MoveExpungeConfirm", gettext_noop("confirm expunging messages after
moving") },
- { "ApplyQuickFilter", gettext_noop("propose to apply quick filter after
creation") },
- { "BrowseImapServers", gettext_noop("propose to get all folders from IMAP
server") },
- { "GfxNotInlined", gettext_noop("inline the big images") },
- { "EditOnOpenFail", gettext_noop("propose to edit folder settings if
opening it failed") },
- { "ExplainColClick", gettext_noop("give explanation when clicking on a
column in the folder view") },
+ { _T("StoreRemoteNow"), gettext_noop("store remote configuration from
options dialog") },
+ { _T("GetRemoteNow"), gettext_noop("retrieve remote configuration from
options dialog") },
+ { _T("OverwriteRemote"), gettext_noop("ask before overwriting remote
configuration settings") },
+ { _T("RetrieveRemote"), gettext_noop("retrieve remote settings at
startup") },
+ { _T("StoreRemote"), gettext_noop("store remote settings at
shutdown") },
+ { _T("StoredRemote"), gettext_noop("show confirmation after remote
config was saved") },
+
+ { _T("ExplainGlobalPasswd"), gettext_noop("show explanation before asking for
global password") },
+ { _T("FilterNotUsedYet"), gettext_noop("warn that newly created filter is
unused") },
+ { _T("FilterOverwrite"), gettext_noop("ask confirmation before
overwriting a filter with another one") },
+ { _T("ImportUnderRoot"), gettext_noop("ask where do you want to import
folders") },
+ { _T("MoveExpungeConfirm"), gettext_noop("confirm expunging messages after
moving") },
+ { _T("ApplyQuickFilter"), gettext_noop("propose to apply quick filter
after creation") },
+ { _T("BrowseImapServers"), gettext_noop("propose to get all folders from
IMAP server") },
+ { _T("GfxNotInlined"), gettext_noop("inline the big images") },
+ { _T("EditOnOpenFail"), gettext_noop("propose to edit folder settings if
opening it failed") },
+ { _T("ExplainColClick"), gettext_noop("give explanation when clicking on
a column in the folder view") },
#ifdef USE_VIEWER_BAR
- { "ViewerBarTip", gettext_noop("give tip about reenabling the viewer
bar when closing it") },
+ { _T("ViewerBarTip"), gettext_noop("give tip about reenabling the
viewer bar when closing it") },
#endif // USE_VIEWER_BAR
- { "EmptyTrashOnExit", gettext_noop("purge trash folder on exit") },
- { "SendOffline", gettext_noop("send mail when the system is offline")
},
- { "AskForVCard", gettext_noop("propose to attach a vCard if none
specified") },
- { "ReenableHint", gettext_noop("hint about how to reenable disabled
message boxes") },
- { "DraftSaved", gettext_noop("confirm saving the message as a
draft") },
- { "DraftAutoDel", gettext_noop("show a warning when \"automatically
delete drafts\" option is on") },
- { "ConfirmResend", gettext_noop("confirm resending messages") },
- { "ConfirmZap", gettext_noop("confirm permanently deleting
messages") },
- { "RememberPGPPassphrase", gettext_noop("remember PGP/GPG passphrase in
memory") },
- { "GetPGPPubKey", gettext_noop("retrieve PGP/GPG public keys from key
server") },
- { "SearchAgainIfNoMatch", gettext_noop("propose to search again if no matches
were found") },
- { "UseCreateFolderWizard", gettext_noop("use wizard when creating a new
folder") },
- { "FormatParagraphBeforeExit",gettext_noop("format all paragraphs in composer
before exit") },
- { "8BitWarn", gettext_noop("warn if 8bit characters are used in
composer and language is not set") },
- { "ContUpdateAfterError", gettext_noop("ask if we should continue updating
folders after an error") },
+ { _T("EmptyTrashOnExit"), gettext_noop("purge trash folder on exit") },
+ { _T("SendOffline"), gettext_noop("send mail when the system is
offline") },
+ { _T("AskForVCard"), gettext_noop("propose to attach a vCard if none
specified") },
+ { _T("ReenableHint"), gettext_noop("hint about how to reenable
disabled message boxes") },
+ { _T("DraftSaved"), gettext_noop("confirm saving the message as a
draft") },
+ { _T("DraftAutoDel"), gettext_noop("show a warning when
\"automatically delete drafts\" option is on") },
+ { _T("ConfirmResend"), gettext_noop("confirm resending messages") },
+ { _T("ConfirmZap"), gettext_noop("confirm permanently deleting
messages") },
+ { _T("RememberPGPPassphrase"), gettext_noop("remember PGP/GPG passphrase in
memory") },
+ { _T("GetPGPPubKey"), gettext_noop("retrieve PGP/GPG public keys from
key server") },
+ { _T("SearchAgainIfNoMatch"), gettext_noop("propose to search again if no
matches were found") },
+ { _T("UseCreateFolderWizard"), gettext_noop("use wizard when creating a new
folder") },
+ { _T("FormatParagraphBeforeExit"),gettext_noop("format all paragraphs in composer
before exit") },
+ { _T("8BitWarn"), gettext_noop("warn if 8bit characters are used
in composer and language is not set") },
+ { _T("ContUpdateAfterError"), gettext_noop("ask if we should continue updating
folders after an error") },
//{ "", gettext_noop("") },
};
@@ -202,5 +202,5 @@
_T("should be kept in sync!") );
- CHECK( which, "", _T("NULL pointer in GetPersMsgBoxName") );
+ CHECK( which, _T(""), _T("NULL pointer in GetPersMsgBoxName") );
return gs_persMsgBoxData[which->GetId()].name;
@@ -215,5 +215,5 @@
if ( gs_persMsgBoxData[n].name == name )
{
- s = _(gs_persMsgBoxData[n].desc);
+ s = wxGetTranslation(gs_persMsgBoxData[n].desc);
break;
}
Index: PathFinder.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/PathFinder.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -b -u -2 -r1.21 -r1.22
--- PathFinder.cpp 18 Sep 2003 16:30:50 -0000 1.21
+++ PathFinder.cpp 11 Oct 2003 17:02:37 -0000 1.22
@@ -33,7 +33,7 @@
#if defined(OS_UNIX)
-# define ANYFILE "/*"
+# define ANYFILE _T("/*")
#elif defined(OS_WIN)
-# define ANYFILE "/*.*"
+# define ANYFILE _T("/*.*")
#endif
@@ -47,12 +47,12 @@
PathFinder::AddPaths(const String & ipathlist, bool recursive, bool prepend)
{
- char *work = new char[ipathlist.length()+1];
- char *found;
+ wxChar *work = new wxChar[ipathlist.length()+1];
+ wxChar *found;
String tmp;
String subdirList = _T("");
MOcheck();
- strcpy(work,ipathlist.c_str());
- found = strtok(work, PATHFINDER_DELIMITER);
+ wxStrcpy(work,ipathlist.c_str());
+ found = wxStrtok(work, PATHFINDER_DELIMITER);
while(found)
@@ -71,5 +71,5 @@
{
if(subdirList.length() > 0)
- subdirList += ":";
+ subdirList += _T(":");
subdirList = subdirList + String(nextfile);
}
@@ -77,5 +77,5 @@
}
}
- found = strtok(NULL, PATHFINDER_DELIMITER);
+ found = wxStrtok(NULL, PATHFINDER_DELIMITER);
}
delete[] work;
-------------------------------------------------------
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
