Update of /cvsroot/mahogany/M/include
In directory usw-pr-cvs1:/tmp/cvs-serv9699/include
Modified Files:
MApplication.h MEvent.h MFPrivate.h MFolder.h MFrame.h
MInterface.cpp.m4 MInterface.h.m4 MObject.h MThread.h
MessageEditor.h MessageView.h
Log Message:
a few fixes for Unicode compilation
Index: MApplication.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/MApplication.h,v
retrieving revision 1.96
retrieving revision 1.97
diff -b -u -2 -r1.96 -r1.97
--- MApplication.h 27 Aug 2002 23:48:57 -0000 1.96
+++ MApplication.h 8 Sep 2002 19:23:07 -0000 1.97
@@ -453,5 +453,5 @@
/// get the translated (if possible) text (used by Python interface only)
- static const char *GetText(const char *text) { return _(text); }
+ static const wxChar *GetText(const wxChar *text) { return wxGetTranslation(text); }
protected:
Index: MEvent.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/MEvent.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -b -u -2 -r1.50 -r1.51
--- MEvent.h 17 Jul 2002 19:22:49 -0000 1.50
+++ MEvent.h 8 Sep 2002 19:23:07 -0000 1.51
@@ -245,5 +245,5 @@
: MEventWithFolderData(MEventId_MsgStatus, folder)
{
- ASSERT_MSG( statusChangeData, "NULL pointer in MEventMsgStatus" );
+ ASSERT_MSG( statusChangeData, _T("NULL pointer in MEventMsgStatus") );
m_statusChangeData = statusChangeData;
Index: MFPrivate.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/MFPrivate.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -b -u -2 -r1.4 -r1.5
--- MFPrivate.h 14 Jul 2002 23:41:22 -0000 1.4
+++ MFPrivate.h 8 Sep 2002 19:23:07 -0000 1.5
@@ -31,5 +31,5 @@
else
{
- FAIL_MSG( "NULL folder in MFInteractiveLock" );
+ FAIL_MSG( _T("NULL folder in MFInteractiveLock") );
}
}
Index: MFolder.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/MFolder.h,v
retrieving revision 1.52
retrieving revision 1.53
diff -b -u -2 -r1.52 -r1.53
--- MFolder.h 7 Sep 2002 20:35:29 -0000 1.52
+++ MFolder.h 8 Sep 2002 19:23:07 -0000 1.53
@@ -306,5 +306,5 @@
else
{
- wxFAIL_MSG( "attempt to create MFolder from non folder profile" );
+ wxFAIL_MSG( _T("attempt to create MFolder from non folder profile") );
m_folder = NULL;
Index: MFrame.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/MFrame.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -b -u -2 -r1.14 -r1.15
--- MFrame.h 20 Oct 2000 13:24:17 -0000 1.14
+++ MFrame.h 8 Sep 2002 19:23:07 -0000 1.15
@@ -31,5 +31,5 @@
/// retrieve the name of the window class
- const char *GetName() const { return name.c_str(); }
+ const wxChar *GetName() const { return name.c_str(); }
// VZ: this could lead to an ambiguity as wxFrame (from which wxMFrame
Index: MInterface.cpp.m4
===================================================================
RCS file: /cvsroot/mahogany/M/include/MInterface.cpp.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -b -u -2 -r1.6 -r1.7
--- MInterface.cpp.m4 15 Jul 2002 16:31:42 -0000 1.6
+++ MInterface.cpp.m4 8 Sep 2002 19:23:07 -0000 1.7
@@ -116,5 +116,5 @@
virtual void MessageDialog (
const char * message, const wxWindow * parent,
-const char * title,
+const wxChar * title,
const char * configPath )
@@ -142,5 +142,5 @@
virtual bool YesNoDialog (
const char * message, const wxWindow * parent,
-const char * title
+const wxChar * title
)
Index: MInterface.h.m4
===================================================================
RCS file: /cvsroot/mahogany/M/include/MInterface.h.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -b -u -2 -r1.6 -r1.7
--- MInterface.h.m4 15 Jul 2002 16:31:42 -0000 1.6
+++ MInterface.h.m4 8 Sep 2002 19:23:07 -0000 1.7
@@ -86,5 +86,5 @@
virtual void MessageDialog (
const char * message , const wxWindow * parent =NULL,
-const char * title =MDIALOG_MSGTITLE,
+const wxChar * title =MDIALOG_MSGTITLE,
const char * configPath =NULL )
= 0;
@@ -102,5 +102,5 @@
virtual bool YesNoDialog (
const char * message , const wxWindow * parent =NULL,
-const char * title =MDIALOG_YESNOTITLE
+const wxChar * title =MDIALOG_YESNOTITLE
)
= 0;
Index: MObject.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/MObject.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -b -u -2 -r1.27 -r1.28
--- MObject.h 17 Jul 2002 00:06:29 -0000 1.27
+++ MObject.h 8 Sep 2002 19:23:07 -0000 1.28
@@ -216,5 +216,5 @@
void Attach(classname *ptr) \
{ \
- ASSERT_MSG( !m_ptr, "should have used Detach() first" ); \
+ ASSERT_MSG( !m_ptr, _T("should have used Detach() first") ); \
\
m_ptr = ptr; \
Index: MThread.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/MThread.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -b -u -2 -r1.2 -r1.3
--- MThread.h 15 Feb 2001 21:26:47 -0000 1.2
+++ MThread.h 8 Sep 2002 19:23:07 -0000 1.3
@@ -34,5 +34,5 @@
void Lock()
{
- ASSERT_MSG( !IsLocked(), "attempting to lock locked mutex" );
+ ASSERT_MSG( !IsLocked(), _T("attempting to lock locked mutex") );
m_locked = true;
@@ -41,10 +41,10 @@
void Unlock()
{
- ASSERT_MSG( IsLocked(), "attempting to unlock unlocked mutex" );
+ ASSERT_MSG( IsLocked(), _T("attempting to unlock unlocked mutex") );
m_locked = false;
}
- ~MMutex() { ASSERT_MSG( !IsLocked(), "deleting locked mutex" ); }
+ ~MMutex() { ASSERT_MSG( !IsLocked(), _T("deleting locked mutex") ); }
private:
Index: MessageEditor.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/MessageEditor.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -b -u -2 -r1.6 -r1.7
--- MessageEditor.h 2 Sep 2002 18:40:01 -0000 1.6
+++ MessageEditor.h 8 Sep 2002 19:23:07 -0000 1.7
@@ -281,5 +281,5 @@
const String& GetText() const
{
- ASSERT_MSG( m_Type == Type_Text, "this attachment doesn't have any text" );
+ ASSERT_MSG( m_Type == Type_Text, _T("this attachment doesn't have any text") );
return m_Text;
@@ -289,5 +289,5 @@
size_t GetLength() const
{
- ASSERT_MSG( m_Type == Type_Text, "this attachment doesn't have any text" );
+ ASSERT_MSG( m_Type == Type_Text, _T("this attachment doesn't have any text") );
return m_Text.length();
@@ -297,5 +297,5 @@
const void *GetData() const
{
- ASSERT_MSG( m_Type == Type_Data, "this attachment doesn't have any data" );
+ ASSERT_MSG( m_Type == Type_Data, _T("this attachment doesn't have any data") );
return m_Data;
@@ -305,5 +305,5 @@
size_t GetSize() const
{
- ASSERT_MSG( m_Type == Type_Data, "this attachment doesn't have any data" );
+ ASSERT_MSG( m_Type == Type_Data, _T("this attachment doesn't have any data") );
return m_Length;
Index: MessageView.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/MessageView.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -b -u -2 -r1.32 -r1.33
--- MessageView.h 20 Jun 2002 14:32:04 -0000 1.32
+++ MessageView.h 8 Sep 2002 19:23:07 -0000 1.33
@@ -673,5 +673,5 @@
const String& GetUrl() const
{
- ASSERT_MSG( m_type == CI_URL, "no URL for this ClickableInfo!" );
+ ASSERT_MSG( m_type == CI_URL, _T("no URL for this ClickableInfo!") );
return m_label;
@@ -681,5 +681,5 @@
const MimePart *GetPart() const
{
- ASSERT_MSG( m_type != CI_URL, "no part number for this ClickableInfo!" );
+ ASSERT_MSG( m_type != CI_URL, _T("no part number for this ClickableInfo!") );
return m_part;
@@ -689,5 +689,5 @@
const String& GetLabel() const
{
- ASSERT_MSG( m_type != CI_URL, "Use GetUrl() for URLs!" );
+ ASSERT_MSG( m_type != CI_URL, _T("Use GetUrl() for URLs!") );
return m_label;
-------------------------------------------------------
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
