Update of /cvsroot/mahogany/M/src/gui
In directory usw-pr-cvs1:/tmp/cvs-serv3800/src/gui
Modified Files:
MImport.cpp Mdnd.cpp wxComposeView.cpp wxFiltersDialog.cpp
wxFolderTree.cpp wxFolderView.cpp wxIconManager.cpp wxMApp.cpp
wxMDialogs.cpp wxMsgCmdProc.cpp wxOptionsDlg.cpp
wxSubfoldersDialog.cpp wxTemplateDialog.cpp
Log Message:
more Unicode fixes
Index: MImport.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/MImport.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -b -u -2 -r1.15 -r1.16
--- MImport.cpp 11 Mar 2002 19:40:53 -0000 1.15
+++ MImport.cpp 12 Sep 2002 02:36:49 -0000 1.16
@@ -402,5 +402,5 @@
else
{
- wxLogDebug("Couldn't load importer module '%s'.",
+ wxLogDebug(_T("Couldn't load importer module '%s'."),
entry.GetName().c_str());
}
Index: Mdnd.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/Mdnd.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -b -u -2 -r1.14 -r1.15
--- Mdnd.cpp 4 Jul 2002 17:22:37 -0000 1.14
+++ Mdnd.cpp 12 Sep 2002 02:36:49 -0000 1.15
@@ -129,5 +129,5 @@
if ( !GetData() )
{
- wxLogDebug("Failed to get drag and drop data");
+ wxLogDebug(_T("Failed to get drag and drop data"));
return wxDragNone;
Index: wxComposeView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxComposeView.cpp,v
retrieving revision 1.304
retrieving revision 1.305
diff -b -u -2 -r1.304 -r1.305
--- wxComposeView.cpp 8 Sep 2002 20:51:27 -0000 1.304
+++ wxComposeView.cpp 12 Sep 2002 02:36:49 -0000 1.305
@@ -1307,5 +1307,5 @@
else // bad header format
{
- wxLogDebug("Corrupted " HEADER_GEOMETRY " header '%s'.",
+ wxLogDebug(_T("Corrupted " HEADER_GEOMETRY " header '%s'."),
value.c_str());
}
@@ -3026,5 +3026,5 @@
if ( remove(m_tmpFileName) != 0 )
{
- wxLogDebug("Stale temp file '%s' left.", m_tmpFileName.c_str());
+ wxLogDebug(_T("Stale temp file '%s' left."), m_tmpFileName.c_str());
}
Index: wxFiltersDialog.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxFiltersDialog.cpp,v
retrieving revision 1.97
retrieving revision 1.98
diff -b -u -2 -r1.97 -r1.98
--- wxFiltersDialog.cpp 8 Sep 2002 19:23:09 -0000 1.97
+++ wxFiltersDialog.cpp 12 Sep 2002 02:36:49 -0000 1.98
@@ -760,5 +760,5 @@
#endif
else
- wxLogDebug("Unknown spam test \"%s\"", t.c_str());
+ wxLogDebug(_T("Unknown spam test \"%s\""), t.c_str());
}
}
Index: wxFolderTree.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxFolderTree.cpp,v
retrieving revision 1.199
retrieving revision 1.200
diff -b -u -2 -r1.199 -r1.200
--- wxFolderTree.cpp 8 Sep 2002 19:23:09 -0000 1.199
+++ wxFolderTree.cpp 12 Sep 2002 02:36:49 -0000 1.200
@@ -1502,5 +1502,5 @@
if ( !ParseColourString(colorName, &col) )
{
- wxLogDebug("Invalid colour string '%s'.", colorName.c_str());
+ wxLogDebug(_T("Invalid colour string '%s'."), colorName.c_str());
col = *wxBLACK;
}
@@ -1556,5 +1556,5 @@
{
/* reserved for future use with UTF-8 */
- wxLogDebug("mailbox name with 8-bit character");
+ wxLogDebug(_T("mailbox name with 8-bit character"));
isValid = false;
break;
@@ -1571,5 +1571,5 @@
{
case '\0':
- wxLogDebug("unterminated modified UTF-7 name");
+ wxLogDebug(_T("unterminated modified UTF-7 name"));
isValid = false;
break;
@@ -1577,5 +1577,5 @@
if (!isalnum (s))
{
- wxLogDebug("invalid modified UTF-7 name");
+ wxLogDebug(_T(_T("invalid modified UTF-7 name")));
isValid = false;
break;
@@ -2983,5 +2983,5 @@
void wxFolderTreeImpl::ProcessMsgNumberChange(const wxString& folderName)
{
- wxLogTrace(M_TRACE_MFSTATUS, "Folder tree: status changed for '%s'.",
+ wxLogTrace(M_TRACE_MFSTATUS, _T("Folder tree: status changed for '%s'."),
folderName.c_str());
@@ -2999,5 +2999,5 @@
// just ignore them as we don't show their status anyhow
wxLogTrace(M_TRACE_MFSTATUS,
- "Folder tree: ignoring it because the folder is not in tree");
+ _T("Folder tree: ignoring it because the folder is not in tree"));
return;
@@ -3014,5 +3014,5 @@
{
wxLogTrace(M_TRACE_MFSTATUS,
- "Folder tree: ignoring it because we don't show status");
+ _T("Folder tree: ignoring it because we don't show status"));
return;
@@ -3027,5 +3027,5 @@
{
wxLogTrace(M_TRACE_MFSTATUS,
- "Folder tree: no cached status, calling CountAllMessages()");
+ _T("Folder tree: no cached status, calling CountAllMessages()"));
// we don't have the status right now, count the messages (the folder
@@ -3034,5 +3034,5 @@
if ( !mf )
{
- wxLogDebug("Failed to update status for '%s'", folderName.c_str());
+ wxLogDebug(_T("Failed to update status for '%s'"), folderName.c_str());
}
else
@@ -3060,5 +3060,5 @@
node->SetStatus(this, status);
- wxLogTrace(M_TRACE_MFSTATUS, "Folder tree: updated status for '%s'",
+ wxLogTrace(M_TRACE_MFSTATUS, _T("Folder tree: updated status for '%s'"),
folderName.c_str());
}
Index: wxFolderView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxFolderView.cpp,v
retrieving revision 1.608
retrieving revision 1.609
diff -b -u -2 -r1.608 -r1.609
--- wxFolderView.cpp 11 Sep 2002 23:58:21 -0000 1.608
+++ wxFolderView.cpp 12 Sep 2002 02:36:49 -0000 1.609
@@ -1973,5 +1973,5 @@
// as we're going to change the global one but this profiles settings
// will override it!
- wxLogDebug("Changing the sort order won't take effect.");
+ wxLogDebug(_T("Changing the sort order won't take effect."));
}
}
@@ -2128,5 +2128,5 @@
wxLogTrace(M_TRACE_FV_SELECTION,
- "SetPreviewMsg(): index = %ld, UID = %08lx",
+ _T("SetPreviewMsg(): index = %ld, UID = %08lx"),
idx, (unsigned long)uid);
@@ -2149,5 +2149,5 @@
m_uidPreviewed = UID_ILLEGAL;
- wxLogTrace(M_TRACE_FV_SELECTION, "Invalidated preview");
+ wxLogTrace(M_TRACE_FV_SELECTION, _T("Invalidated preview"));
}
@@ -2318,5 +2318,5 @@
wxLogTrace(M_TRACE_FV_SELECTION,
- "Updated focused UID, now %08lx (index = %ld)",
+ _T("Updated focused UID, now %08lx (index = %ld)"),
(unsigned long)m_uidFocus, (unsigned long)index);
}
@@ -2386,6 +2386,6 @@
wxLogTrace(M_TRACE_FV_SELECTION,
- "Updated focused UID from OnIdle(), now %08lx "
- "(index = %ld)",
+ _T("Updated focused UID from OnIdle(), now %08lx "
+ "(index = %ld)"),
(unsigned long)m_uidFocus, m_itemFocus);
@@ -2647,5 +2647,5 @@
wxLogTrace(M_TRACE_FV_SELECTION,
- "UpdateFocus(): index = %ld, UID = %08lx",
+ _T("UpdateFocus(): index = %ld, UID = %08lx"),
itemFocus, (unsigned long)m_uidFocus);
}
@@ -3552,5 +3552,5 @@
m_FolderCtrl->UpdateListing(mf->GetHeaders());
- wxLogTrace(M_TRACE_FV_UPDATE, "wxFolderView::Update(): %d headers.",
+ wxLogTrace(M_TRACE_FV_UPDATE, _T("wxFolderView::Update(): %d headers."),
m_FolderCtrl->GetItemCount());
@@ -4570,5 +4570,5 @@
wxFolderView::OnFocusChange(long idx, UIdType uid)
{
- wxLogTrace(M_TRACE_FV_SELECTION, "item %ld (uid = %lx) is now focused",
+ wxLogTrace(M_TRACE_FV_SELECTION, _T("item %ld (uid = %lx) is now focused"),
idx, uid);
@@ -4630,5 +4630,5 @@
if ( event.GetFolder() == mf )
{
- wxLogTrace(M_TRACE_FV_UPDATE, "wxFolderView::Clear()");
+ wxLogTrace(M_TRACE_FV_UPDATE, _T("wxFolderView::Clear()"));
Clear();
@@ -4677,5 +4677,5 @@
count = event.GetCount();
- wxLogTrace(M_TRACE_FV_UPDATE, "wxFolderView::Expunge(%lu items), now %d",
+ wxLogTrace(M_TRACE_FV_UPDATE, _T("wxFolderView::Expunge(%lu items), now %d"),
(unsigned long)count, m_FolderCtrl->GetItemCount());
@@ -5094,5 +5094,5 @@
if ( !strWidths[col].ToULong(&w) )
{
- wxLogDebug("Invalid width for the column %u", (unsigned)n);
+ wxLogDebug(_T("Invalid width for the column %u"), (unsigned)n);
w = 0;
Index: wxIconManager.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxIconManager.cpp,v
retrieving revision 1.89
retrieving revision 1.90
diff -b -u -2 -r1.89 -r1.90
--- wxIconManager.cpp 19 Dec 2001 17:22:04 -0000 1.89
+++ wxIconManager.cpp 12 Sep 2002 02:36:50 -0000 1.90
@@ -228,5 +228,5 @@
command.Printf(strConvertProgram, filename.c_str(), tempfile.c_str());
wxLogTrace(wxTraceIconLoading,
- "wxIconManager::LoadImage() calling '%s'...",
+ _T("wxIconManager::LoadImage() calling '%s'..."),
command.c_str());
if(system(command) == 0)
@@ -300,5 +300,5 @@
char **cpptr = NULL;
- wxLogTrace(wxTraceIconLoading, "wxIconManager::LoadImage(%s) called...",
+ wxLogTrace(wxTraceIconLoading, _T("wxIconManager::LoadImage(%s) called..."),
filename.c_str());
@@ -322,5 +322,5 @@
filename.c_str(), tempfile.c_str());
wxLogTrace(wxTraceIconLoading,
- "wxIconManager::LoadImage() calling '%s'...",
+ _T("wxIconManager::LoadImage() calling '%s'..."),
command.c_str());
if(system(command) == 0)
@@ -508,5 +508,5 @@
if (strcmp((*i)->iconName.c_str(), iconName.c_str()) == 0 )
{
- wxLogTrace(wxTraceIconLoading, "... icon was in the cache.");
+ wxLogTrace(wxTraceIconLoading, _T("... icon was in the cache."));
*icon = (*i)->iconRef;
@@ -536,5 +536,5 @@
strutil_tolower(iconName);
- wxLogTrace(wxTraceIconLoading, "wxIconManager::GetIcon(%s) called...",
+ wxLogTrace(wxTraceIconLoading, _T("wxIconManager::GetIcon(%s) called..."),
iconNameOrig.c_str());
@@ -580,5 +580,5 @@
id->iconRef = icon;
id->iconName = iconName;
- wxLogTrace(wxTraceIconLoading, "... icon found in '%s'",
+ wxLogTrace(wxTraceIconLoading, _T("... icon found in '%s'"),
name.c_str());
m_iconList->push_front(id);
@@ -594,5 +594,5 @@
wxIcon icon(iconNameOrig);
if ( icon.Ok() ) {
- wxLogTrace(wxTraceIconLoading, "... icon found in the ressources.");
+ wxLogTrace(wxTraceIconLoading, _T("... icon found in the ressources."));
return icon;
}
@@ -602,5 +602,5 @@
#endif //Windows
- wxLogTrace(wxTraceIconLoading, "... icon not found.");
+ wxLogTrace(wxTraceIconLoading, _T("... icon not found."));
return m_unknownIcon;
Index: wxMApp.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMApp.cpp,v
retrieving revision 1.250
retrieving revision 1.251
diff -b -u -2 -r1.250 -r1.251
--- wxMApp.cpp 9 Sep 2002 16:00:50 -0000 1.250
+++ wxMApp.cpp 12 Sep 2002 02:36:50 -0000 1.251
@@ -217,5 +217,5 @@
virtual void Notify()
{
- wxLogTrace(TRACE_TIMER, "Autosaving options and folder status.");
+ wxLogTrace(TRACE_TIMER, _T("Autosaving options and folder status."));
(void)SaveAll();
@@ -252,5 +252,5 @@
virtual void Notify()
{
- wxLogTrace(TRACE_TIMER, "Going away on timer");
+ wxLogTrace(TRACE_TIMER, _T("Going away on timer"));
mApplication->SetAwayMode(TRUE);
@@ -301,5 +301,5 @@
return;
- wxLogTrace(TRACE_TIMER, "Collection timer expired.");
+ wxLogTrace(TRACE_TIMER, _T("Collection timer expired."));
mApplication->UpdateOutboxStatus();
@@ -590,6 +590,5 @@
M_DLG_NO_DEFAULT, M_MSGBOX_CONFIRM_EXIT) )
{
- wxLogDebug("Exit confirmation msg box has been disabled on [No], "
- "reenabling it.");
+ wxLogDebug(_T("Exit confirmation msg box has been disabled on [No],
+reenabling it."));
wxPMessageBoxEnable(path);
Index: wxMDialogs.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMDialogs.cpp,v
retrieving revision 1.380
retrieving revision 1.381
diff -b -u -2 -r1.380 -r1.381
--- wxMDialogs.cpp 8 Sep 2002 19:23:09 -0000 1.380
+++ wxMDialogs.cpp 12 Sep 2002 02:36:50 -0000 1.381
@@ -1527,5 +1527,5 @@
if ( !m_tree->SelectFolder(folder) )
{
- wxLogDebug("Couldn't restore the last selected folder in the tree.");
+ wxLogDebug(_T("Couldn't restore the last selected folder in the tree."));
}
Index: wxMsgCmdProc.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMsgCmdProc.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -b -u -2 -r1.33 -r1.34
--- wxMsgCmdProc.cpp 8 Sep 2002 19:23:10 -0000 1.33
+++ wxMsgCmdProc.cpp 12 Sep 2002 02:36:50 -0000 1.34
@@ -1236,5 +1236,5 @@
if ( idx == UID_ILLEGAL )
{
- wxLogDebug("Inexistent message (uid = %lu) selected?", uid);
+ wxLogDebug(_T("Inexistent message (uid = %lu) selected?"), uid);
continue;
@@ -1411,5 +1411,5 @@
MFolder *folder)
{
- wxLogTrace(M_TRACE_DND, "Saving %d message(s) to folder '%s'",
+ wxLogTrace(M_TRACE_DND, _T("Saving %d message(s) to folder '%s'"),
selections.Count(), folder->GetFullName().c_str());
@@ -1418,5 +1418,5 @@
if ( !m_TicketsDroppedList )
{
- wxLogTrace(M_TRACE_DND, "Creating m_TicketsDroppedList");
+ wxLogTrace(M_TRACE_DND, _T("Creating m_TicketsDroppedList"));
m_TicketsDroppedList = ASTicketList::Create();
@@ -1465,10 +1465,10 @@
// always give this one in debug mode, it is not supposed to
// happen!
- wxLogDebug("An error occured during drag and drop operation");
+ wxLogDebug(_T("An error occured during drag and drop operation"));
break;
case wxDragNone:
case wxDragCancel:
- wxLogTrace(M_TRACE_DND, "Drag and drop aborted by user.");
+ wxLogTrace(M_TRACE_DND, _T("Drag and drop aborted by user."));
break;
@@ -1496,5 +1496,5 @@
m_UIdsCopiedOk.Empty();
- wxLogTrace(M_TRACE_DND, "Deleted previously dropped msgs.");
+ wxLogTrace(M_TRACE_DND, _T("Deleted previously dropped msgs."));
}
else
@@ -1502,5 +1502,5 @@
// maybe we didn't have time to really copy the messages
// yet, then they will be deleted later
- wxLogTrace(M_TRACE_DND, "Dropped msgs will be deleted later");
+ wxLogTrace(M_TRACE_DND, _T("Dropped msgs will be deleted later"));
}
}
@@ -1519,9 +1519,9 @@
m_TicketsDroppedList = NULL;
- wxLogTrace(M_TRACE_DND, "DragAndDropMessages() done ok");
+ wxLogTrace(M_TRACE_DND, _T("DragAndDropMessages() done ok"));
}
else
{
- wxLogTrace(M_TRACE_DND, "Nothing dropped");
+ wxLogTrace(M_TRACE_DND, _T("Nothing dropped"));
}
@@ -1642,5 +1642,5 @@
m_TicketsDroppedList->Remove(t);
- wxLogTrace(M_TRACE_DND, "Dropped msgs copied ok");
+ wxLogTrace(M_TRACE_DND, _T("Dropped msgs copied ok"));
}
Index: wxOptionsDlg.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxOptionsDlg.cpp,v
retrieving revision 1.340
retrieving revision 1.341
diff -b -u -2 -r1.340 -r1.341
--- wxOptionsDlg.cpp 11 Sep 2002 23:25:42 -0000 1.340
+++ wxOptionsDlg.cpp 12 Sep 2002 02:36:50 -0000 1.341
@@ -3401,5 +3401,5 @@
if ( nIncomingDelay != m_nIncomingDelay )
{
- wxLogTrace("timer", "Restarting timer for polling incoming folders");
+ wxLogTrace(_T("timer"), _T("Restarting timer for polling incoming folders"));
rc = mApplication->RestartTimer(MAppBase::Timer_PollIncoming);
@@ -3408,5 +3408,5 @@
if ( rc && (nPingDelay != m_nPingDelay) )
{
- wxLogTrace("timer", "Restarting timer for pinging folders");
+ wxLogTrace(_T("timer"), _T("Restarting timer for pinging folders"));
rc = mApplication->RestartTimer(MAppBase::Timer_PingFolder);
Index: wxSubfoldersDialog.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxSubfoldersDialog.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -b -u -2 -r1.67 -r1.68
--- wxSubfoldersDialog.cpp 8 Sep 2002 19:23:11 -0000 1.67
+++ wxSubfoldersDialog.cpp 12 Sep 2002 02:36:50 -0000 1.68
@@ -576,5 +576,5 @@
else
{
- wxLogDebug("Folder specification '%s' unexpected.", spec.c_str());
+ wxLogDebug(_T("Folder specification '%s' unexpected."), spec.c_str());
}
}
@@ -1320,5 +1320,5 @@
else
{
- wxLogDebug("Folder specification '%s' unexpected.", spec.c_str());
+ wxLogDebug(_T("Folder specification '%s' unexpected."), spec.c_str());
}
}
Index: wxTemplateDialog.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxTemplateDialog.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -b -u -2 -r1.25 -r1.26
--- wxTemplateDialog.cpp 8 Sep 2002 19:23:11 -0000 1.25
+++ wxTemplateDialog.cpp 12 Sep 2002 02:36:50 -0000 1.26
@@ -885,5 +885,5 @@
if ( kindLastEdited < 0 || kindLastEdited >= MessageTemplate_Max )
{
- wxLogDebug("Corrupted TemplateEditKind entry in config.");
+ wxLogDebug(_T("Corrupted TemplateEditKind entry in config."));
kindLastEdited = MessageTemplate_Reply;
-------------------------------------------------------
In remembrance
www.osdn.com/911/
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
