Update of /cvsroot/mahogany/M/src/modules
In directory usw-pr-cvs1:/tmp/cvs-serv9699/src/modules
Modified Files:
Calendar.cpp Filters.cpp HtmlViewer.cpp LayoutEditor.cpp
LayoutViewer.cpp PalmOS.cpp TextViewer.cpp
Log Message:
a few fixes for Unicode compilation
Index: Calendar.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/modules/Calendar.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -b -u -2 -r1.38 -r1.39
--- Calendar.cpp 14 Jul 2002 23:41:23 -0000 1.38
+++ Calendar.cpp 8 Sep 2002 19:23:11 -0000 1.39
@@ -591,7 +591,7 @@
m_CalMod = calmod;
m_regASFResult = MEventManager::Register(*this, MEventId_ASFolderResult);
- ASSERT_MSG( m_regASFResult, "can't reg calendar with event manager");
+ ASSERT_MSG( m_regASFResult, _T("can't reg calendar with event manager"));
m_regCookieFolderUpdate = MEventManager::Register(*this,
MEventId_FolderUpdate);
- ASSERT_MSG( m_regCookieFolderUpdate, "can't reg calendar with event
manager");
+ ASSERT_MSG( m_regCookieFolderUpdate, _T("can't reg calendar with event
+manager"));
}
/// event processing function
@@ -882,5 +882,5 @@
{
// we are using synchronous access which is soo much easier:
- CHECK_RET( m_Folder, "no calendar folder in the calendar module" );
+ CHECK_RET( m_Folder, _T("no calendar folder in the calendar module") );
MailFolder *mf = m_Folder->GetMailFolder();
@@ -972,5 +972,5 @@
CalendarFrame::CheckUpdate(MailFolder *eventFolder)
{
- CHECK_RET( m_Folder, "no calendar folder in the calendar module" );
+ CHECK_RET( m_Folder, _T("no calendar folder in the calendar module") );
MailFolder *mf = m_Folder->GetMailFolder();
@@ -1143,5 +1143,5 @@
wxMFrame *mframe = mapp->TopLevelFrame();
- CHECK( mframe, false, "can't init calendar module - no main window" );
+ CHECK( mframe, false, _T("can't init calendar module - no main window") );
((wxMainFrame *)mframe)->AddModulesMenu
Index: Filters.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/modules/Filters.cpp,v
retrieving revision 1.129
retrieving revision 1.130
diff -b -u -2 -r1.129 -r1.130
--- Filters.cpp 7 Sep 2002 00:05:58 -0000 1.129
+++ Filters.cpp 8 Sep 2002 19:23:11 -0000 1.130
@@ -2778,5 +2778,5 @@
// note the use of explicit scope qualifier to avoid conflicts with our
// Error() member function
- CHECK( mf, FilterRule::Error, "FilterRule::Apply(): NULL parameter" );
+ CHECK( mf, FilterRule::Error, _T("FilterRule::Apply(): NULL parameter") );
// no error yet
@@ -2842,5 +2842,5 @@
if ( m_MessageUId == UID_ILLEGAL )
{
- FAIL_MSG( "invalid UID in FilterRule::Apply()!" );
+ FAIL_MSG( _T("invalid UID in FilterRule::Apply()!") );
continue;
Index: HtmlViewer.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/modules/HtmlViewer.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -b -u -2 -r1.38 -r1.39
--- HtmlViewer.cpp 5 Jul 2002 16:56:18 -0000 1.38
+++ HtmlViewer.cpp 8 Sep 2002 19:23:12 -0000 1.39
@@ -392,5 +392,5 @@
wxHtmlLinkInfo *link = cell->GetLink();
wxFrame *frame = GetFrame(this);
- CHECK_RET( frame, "no parent frame?" );
+ CHECK_RET( frame, _T("no parent frame?") );
String statText;
@@ -896,5 +896,5 @@
// this is not called by MessageView yet, but should be implemented when it
// starts recognizing signatures in the messages
- FAIL_MSG( "not implemented" );
+ FAIL_MSG( _T("not implemented") );
}
Index: LayoutEditor.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/modules/LayoutEditor.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -b -u -2 -r1.9 -r1.10
--- LayoutEditor.cpp 2 Sep 2002 18:40:01 -0000 1.9
+++ LayoutEditor.cpp 8 Sep 2002 19:23:12 -0000 1.10
@@ -263,5 +263,5 @@
if ( m_exportStatus )
{
- FAIL_MSG( "GetNextPart() must be called until it returns NULL!" );
+ FAIL_MSG( _T("GetNextPart() must be called until it returns NULL!") );
delete m_exportStatus;
@@ -548,5 +548,5 @@
{
CHECK( !m_exportStatus, NULL,
- "GetNextPart() should be called, not GetFirstPart()" );
+ _T("GetNextPart() should be called, not GetFirstPart()") );
m_exportStatus = new wxLayoutExportStatus(m_LayoutWindow->GetLayoutList());
@@ -557,5 +557,5 @@
EditorContentPart *LayoutEditor::GetNextPart()
{
- CHECK( m_exportStatus, NULL, "must call GetFirstPart() first!" );
+ CHECK( m_exportStatus, NULL, _T("must call GetFirstPart() first!") );
for ( ;; )
@@ -603,5 +603,5 @@
default:
- FAIL_MSG( "unexpected layout object type" );
+ FAIL_MSG( _T("unexpected layout object type") );
continue;
}
Index: LayoutViewer.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/modules/LayoutViewer.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -b -u -2 -r1.25 -r1.26
--- LayoutViewer.cpp 25 Jul 2002 15:54:50 -0000 1.25
+++ LayoutViewer.cpp 8 Sep 2002 19:23:12 -0000 1.26
@@ -250,5 +250,5 @@
default:
- FAIL_MSG("unknown mouse action");
+ FAIL_MSG(_T("unknown mouse action"));
case WXLOWIN_MENU_LCLICK:
@@ -380,5 +380,5 @@
default:
- FAIL_MSG( "unexpected wxLayoutExport result" );
+ FAIL_MSG( _T("unexpected wxLayoutExport result") );
}
}
@@ -522,5 +522,5 @@
// as we return false from our CanProcess(), MessageView is not supposed to
// ask us to process any raw data
- FAIL_MSG( "LayoutViewer::InsertRawContents() shouldn't be called" );
+ FAIL_MSG( _T("LayoutViewer::InsertRawContents() shouldn't be called") );
}
Index: PalmOS.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/modules/PalmOS.cpp,v
retrieving revision 1.116
retrieving revision 1.117
diff -b -u -2 -r1.116 -r1.117
--- PalmOS.cpp 28 Jan 2002 13:51:41 -0000 1.116
+++ PalmOS.cpp 8 Sep 2002 19:23:12 -0000 1.117
@@ -380,5 +380,5 @@
int MAL_PrintFunc(bool errorflag, const char * format, va_list args)
{
- CHECK(gs_MInterface != NULL, 0, "no MInterface");
+ CHECK(gs_MInterface != NULL, 0, _T("no MInterface"));
static wxString msg;
int rc;
@@ -667,5 +667,5 @@
wxMFrame *mframe = mapp->TopLevelFrame();
- CHECK( mframe, false, "can't init PalmOS module - no main window" );
+ CHECK( mframe, false, _T("can't init PalmOS module - no main window") );
((wxMainFrame *)mapp->TopLevelFrame())->AddModulesMenu(_("&PalmOS Module"),
Index: TextViewer.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/modules/TextViewer.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -b -u -2 -r1.35 -r1.36
--- TextViewer.cpp 7 May 2002 23:34:29 -0000 1.35
+++ TextViewer.cpp 8 Sep 2002 19:23:12 -0000 1.36
@@ -337,5 +337,5 @@
else // must be double click, what else?
{
- ASSERT_MSG( event.LeftDClick(), "unexpected mouse event" );
+ ASSERT_MSG( event.LeftDClick(), _T("unexpected mouse event") );
id = WXMENU_LAYOUT_DBLCLICK;
@@ -571,5 +571,5 @@
// as we return false from CanInlineImages() this is not supposed to be
// called
- FAIL_MSG( "unexpected call to TextViewer::InsertImage" );
+ FAIL_MSG( _T("unexpected call to TextViewer::InsertImage") );
}
@@ -578,5 +578,5 @@
// as we return false from our CanProcess(), MessageView is not supposed to
// ask us to process any raw data
- FAIL_MSG( "unexpected call to TextViewer::InsertRawContents()" );
+ FAIL_MSG( _T("unexpected call to TextViewer::InsertRawContents()") );
}
-------------------------------------------------------
This sf.net email is sponsored by: OSDN - Tired of that same old
cell phone? Get a new here for FREE!
https://www.inphonic.com/r.asp?r=sourceforge1&refcode1=vs3390
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
