Update of /cvsroot/mahogany/M/include
In directory usw-pr-cvs1:/tmp/cvs-serv7348/include
Modified Files:
Composer.h MApplication.h MImport.h MInterface.cpp.m4
MInterface.h.m4 MLogFrame.h MMainFrame.h MModule.h
MailFolder.h Message.h MessageTemplate.h MessageView.h XFace.h
strutil.h sysutil.h
Log Message:
Unicode fixes
Index: Composer.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/Composer.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -b -u -2 -r1.14 -r1.15
--- Composer.h 7 Sep 2002 00:04:45 -0000 1.14
+++ Composer.h 13 Sep 2002 01:27:46 -0000 1.15
@@ -236,6 +236,6 @@
virtual void InsertData(void *data,
size_t length,
- const char *mimetype = NULL,
- const char *filename = NULL) = 0;
+ const wxChar *mimetype = NULL,
+ const wxChar *filename = NULL) = 0;
/// inserts a text
Index: MApplication.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/MApplication.h,v
retrieving revision 1.97
retrieving revision 1.98
diff -b -u -2 -r1.97 -r1.98
--- MApplication.h 8 Sep 2002 19:23:07 -0000 1.97
+++ MApplication.h 13 Sep 2002 01:27:46 -0000 1.98
@@ -446,5 +446,5 @@
/// Report a fatal error:
- virtual void FatalError(const char *message) = 0;
+ virtual void FatalError(const wxChar *message) = 0;
/// remove the module from the list of all modules
@@ -578,5 +578,5 @@
extern "C"
{
- void FatalError(const char *message);
+ void FatalError(const wxChar *message);
};
Index: MImport.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/MImport.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -b -u -2 -r1.5 -r1.6
--- MImport.h 25 Apr 2001 13:53:57 -0000 1.5
+++ MImport.h 13 Sep 2002 01:27:46 -0000 1.6
@@ -81,5 +81,5 @@
// return the name of the program we work with (generated during
// DECLARE_M_IMPORTER and IMPLEMENT_M_IMPORTER macro expansion)
- virtual const char *GetProgName() const = 0;
+ virtual const wxChar *GetProgName() const = 0;
};
@@ -101,5 +101,5 @@
// this macro must be used inside the declaration of the importer class
#define DECLARE_M_IMPORTER() \
- virtual const char *GetProgName() const; \
+ virtual const wxChar *GetProgName() const; \
MMODULE_DEFINE(); \
DEFAULT_ENTRY_FUNC \
@@ -115,5 +115,5 @@
#define MIMPORTER_END_IMPLEMENT(cname) \
MMODULE_END_IMPLEMENT(cname) \
- const char *cname::GetProgName() const \
+ const wxChar *cname::GetProgName() const \
{ \
return GetMModuleProperty(ms_properties, M_IMPORTER_PROG_NAME); \
Index: MInterface.cpp.m4
===================================================================
RCS file: /cvsroot/mahogany/M/include/MInterface.cpp.m4,v
retrieving revision 1.7
retrieving revision 1.8
diff -b -u -2 -r1.7 -r1.8
--- MInterface.cpp.m4 8 Sep 2002 19:23:07 -0000 1.7
+++ MInterface.cpp.m4 13 Sep 2002 01:27:46 -0000 1.8
@@ -86,5 +86,5 @@
virtual wxPListCtrl * CreatePListCtrl (
-const char * name,
+const wxChar * name,
wxWindow * parent,
long int id,
@@ -102,5 +102,5 @@
virtual Message * CreateMessage (
-const char * text,
+const wxChar * text,
UIdType uid,
Profile * profile
@@ -115,7 +115,7 @@
virtual void MessageDialog (
-const char * message, const wxWindow * parent,
+const wxChar * message, const wxWindow * parent,
const wxChar * title,
-const char * configPath )
+const wxChar * configPath )
{
@@ -129,5 +129,5 @@
virtual void Log (
int level,
-const char * message
+const wxChar * message
)
@@ -141,5 +141,5 @@
virtual bool YesNoDialog (
-const char * message, const wxWindow * parent,
+const wxChar * message, const wxWindow * parent,
const wxChar * title
)
@@ -153,5 +153,5 @@
-virtual void StatusMessage ( const char * message )
+virtual void StatusMessage ( const wxChar * message )
{
@@ -176,5 +176,5 @@
virtual MFolder * GetMFolder (
-const char * name
+const wxChar * name
)
{
@@ -185,5 +185,5 @@
virtual MailFolder * OpenMailFolder (
-const char * path
+const wxChar * path
)
{
@@ -196,5 +196,5 @@
virtual ASMailFolder * OpenASMailFolder (
-const char * path
+const wxChar * path
)
{
Index: MInterface.h.m4
===================================================================
RCS file: /cvsroot/mahogany/M/include/MInterface.h.m4,v
retrieving revision 1.7
retrieving revision 1.8
diff -b -u -2 -r1.7 -r1.8
--- MInterface.h.m4 8 Sep 2002 19:23:07 -0000 1.7
+++ MInterface.h.m4 13 Sep 2002 01:27:46 -0000 1.8
@@ -67,5 +67,5 @@
virtual wxPListCtrl * CreatePListCtrl (
-const char * name ,
+const wxChar * name ,
wxWindow * parent =NULL,
long int id =-1,
@@ -77,5 +77,5 @@
virtual Message * CreateMessage (
-const char * text ,
+const wxChar * text ,
UIdType uid = UID_ILLEGAL,
Profile * profile =NULL
@@ -85,7 +85,7 @@
virtual void MessageDialog (
-const char * message , const wxWindow * parent =NULL,
+const wxChar * message , const wxWindow * parent =NULL,
const wxChar * title =MDIALOG_MSGTITLE,
-const char * configPath =NULL )
+const wxChar * configPath =NULL )
= 0;
@@ -94,5 +94,5 @@
virtual void Log (
int level ,
-const char * message
+const wxChar * message
)
= 0;
@@ -101,5 +101,5 @@
virtual bool YesNoDialog (
-const char * message , const wxWindow * parent =NULL,
+const wxChar * message , const wxWindow * parent =NULL,
const wxChar * title =MDIALOG_YESNOTITLE
)
@@ -108,5 +108,5 @@
-virtual void StatusMessage ( const char * message )
+virtual void StatusMessage ( const wxChar * message )
= 0;
@@ -121,5 +121,5 @@
virtual MFolder * GetMFolder (
-const char * name
+const wxChar * name
) = 0;
@@ -127,5 +127,5 @@
virtual MailFolder * OpenMailFolder (
-const char * path
+const wxChar * path
) = 0;
@@ -133,5 +133,5 @@
virtual ASMailFolder * OpenASMailFolder (
-const char * path
+const wxChar * path
) = 0;
Index: MLogFrame.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/MLogFrame.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -b -u -2 -r1.8 -r1.9
--- MLogFrame.h 12 Apr 2001 17:08:00 -0000 1.8
+++ MLogFrame.h 13 Sep 2002 01:27:46 -0000 1.9
@@ -27,5 +27,5 @@
/// save the log contents to file (ask user for file name if !filename)
- virtual bool Save(const char *filename = NULL) = 0;
+ virtual bool Save(const wxChar *filename = NULL) = 0;
/// make the dtor virtual for all derived classes
Index: MMainFrame.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/MMainFrame.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -b -u -2 -r1.8 -r1.9
--- MMainFrame.h 30 Oct 2001 12:45:37 -0000 1.8
+++ MMainFrame.h 13 Sep 2002 01:27:46 -0000 1.9
@@ -29,12 +29,12 @@
/// Appends the menu for a module to the menubar
- virtual void AddModulesMenu(const char *name,
- const char *help,
+ virtual void AddModulesMenu(const wxChar *name,
+ const wxChar *help,
class wxMenu *submenu,
int id = -1) = 0;
/// Appends the menu entry for a module to the modules menu
- virtual void AddModulesMenu(const char *name,
- const char *help,
+ virtual void AddModulesMenu(const wxChar *name,
+ const wxChar *help,
int id) = 0;
Index: MModule.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/MModule.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -b -u -2 -r1.51 -r1.52
--- MModule.h 16 Mar 2002 13:47:05 -0000 1.51
+++ MModule.h 13 Sep 2002 01:27:46 -0000 1.52
@@ -158,6 +158,6 @@
struct ModuleProperty
{
- const char *name;
- const char *value;
+ const wxChar *name;
+ const wxChar *value;
};
@@ -205,5 +205,5 @@
/**
This is the interface for Mahogany extension modules.
- Only simple types like const char * are used to keep modules as
+ Only simple types like const char * (FIXME Nerijus wxChar * ?) are used to keep
+modules as
simple as possible and reduce dependencies on other libraries
(e.g. wxWindows or libstc++).
@@ -217,11 +217,11 @@
//@{
/// Returns the Module's name as used in LoadModule().
- virtual const char * GetName(void) const = 0;
+ virtual const wxChar * GetName(void) const = 0;
/// Returns the name of the interface ABC that this module implements.
- virtual const char * GetInterface(void) const = 0;
+ virtual const wxChar * GetInterface(void) const = 0;
/// Returns a brief description of the module.
- virtual const char * GetDescription(void) const = 0;
+ virtual const wxChar * GetDescription(void) const = 0;
/// Returns a textual representation of the particular version of the module.
- virtual const char * GetVersion(void) const = 0;
+ virtual const wxChar * GetVersion(void) const = 0;
/// Returns the Mahogany version this module was compiled for.
@@ -313,8 +313,8 @@
/** Used by modules to register themselves statically. */
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 init);
@@ -335,8 +335,8 @@
#define MMODULE_DEFINE() \
public: \
- virtual const char * GetName(void) const; \
- virtual const char * GetInterface(void) const; \
- virtual const char * GetDescription(void) const; \
- virtual const char * GetVersion(void) const; \
+ virtual const wxChar * GetName(void) const; \
+ virtual const wxChar * GetInterface(void) const; \
+ virtual const wxChar * GetDescription(void) const; \
+ virtual const wxChar * GetVersion(void) const; \
virtual void GetMVersion(int *version_major, \
int *version_minor, \
@@ -404,11 +404,11 @@
} \
} \
-const char * ClassName::GetName(void) const \
+const wxChar * ClassName::GetName(void) const \
{ return GetMModuleProperty(GetMModuleProperties(), MMODULE_NAME_PROP); } \
-const char * ClassName::GetInterface(void) const \
+const wxChar * ClassName::GetInterface(void) const \
{ return GetMModuleProperty(GetMModuleProperties(), MMODULE_INTERFACE_PROP); } \
-const char * ClassName::GetDescription(void) const \
+const wxChar * ClassName::GetDescription(void) const \
{ return GetMModuleProperty(GetMModuleProperties(), MMODULE_DESC_PROP); } \
-const char * ClassName::GetVersion(void) const \
+const wxChar * ClassName::GetVersion(void) const \
{ return GetMModuleProperty(GetMModuleProperties(), MMODULE_VERSION_PROP); }
@@ -419,5 +419,5 @@
/** Get a module property from the properties table */
extern
-const char *GetMModuleProperty(const ModuleProperty *table, const char *name);
+const wxChar *GetMModuleProperty(const ModuleProperty *table, const wxChar *name);
/** Call this before application exit. */
Index: MailFolder.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/MailFolder.h,v
retrieving revision 1.183
retrieving revision 1.184
diff -b -u -2 -r1.183 -r1.184
--- MailFolder.h 5 Sep 2002 23:45:16 -0000 1.183
+++ MailFolder.h 13 Sep 2002 01:27:46 -0000 1.184
@@ -323,5 +323,5 @@
@return true if everything went ok, false on error
*/
- static bool SaveMessageAsMBOX(const String& filename, const char *contents);
+ static bool SaveMessageAsMBOX(const String& filename, const wxChar *contents);
//@}
Index: Message.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/Message.h,v
retrieving revision 1.65
retrieving revision 1.66
diff -b -u -2 -r1.65 -r1.66
--- Message.h 3 Sep 2002 12:28:18 -0000 1.65
+++ Message.h 13 Sep 2002 01:27:46 -0000 1.66
@@ -146,5 +146,5 @@
@return the array containing the header values
*/
- virtual wxArrayString GetHeaderLines(const char **headers,
+ virtual wxArrayString GetHeaderLines(const wxChar **headers,
wxArrayInt *encodings = NULL) const = 0;
Index: MessageTemplate.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/MessageTemplate.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -b -u -2 -r1.11 -r1.12
--- MessageTemplate.h 4 Mar 2002 20:53:27 -0000 1.11
+++ MessageTemplate.h 13 Sep 2002 01:27:46 -0000 1.12
@@ -167,5 +167,5 @@
private:
// parse an expression starting with '$'
- bool ExpandTemplate(const char **ppc, String *value) const;
+ bool ExpandTemplate(const wxChar **ppc, String *value) const;
MessageTemplateVarExpander *m_expander;
@@ -180,5 +180,5 @@
// start of the current line (for calculating the offset in line for the
// error messages)
- const char *m_pStartOfLine;
+ const wxChar *m_pStartOfLine;
};
Index: MessageView.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/MessageView.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -b -u -2 -r1.33 -r1.34
--- MessageView.h 8 Sep 2002 19:23:07 -0000 1.33
+++ MessageView.h 13 Sep 2002 01:27:46 -0000 1.34
@@ -212,5 +212,5 @@
/// saves the currently selected MIME content
- bool MimeSave(const MimePart *part, const char *filename = NULL);
+ bool MimeSave(const MimePart *part, const wxChar *filename = NULL);
/// view attachment as text
@@ -358,5 +358,5 @@
/// return the quoting level of this line, 0 if unquoted
- size_t GetQuotedLevel(const char *text) const;
+ size_t GetQuotedLevel(const wxChar *text) const;
/// return the colour to use for the given quoting level
Index: XFace.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/XFace.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -b -u -2 -r1.10 -r1.11
--- XFace.h 27 Jul 1999 21:33:57 -0000 1.10
+++ XFace.h 13 Sep 2002 01:27:46 -0000 1.11
@@ -77,5 +77,5 @@
@return true on success
*/
- bool CreateFromXFace(const char *xfacedata);
+ bool CreateFromXFace(const wxChar *xfacedata);
/**
Index: strutil.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/strutil.h,v
retrieving revision 1.56
retrieving revision 1.57
diff -b -u -2 -r1.56 -r1.57
--- strutil.h 25 Apr 2002 18:25:41 -0000 1.56
+++ strutil.h 13 Sep 2002 01:27:46 -0000 1.57
@@ -166,5 +166,5 @@
@return number of quoting levels
*/
-int strutil_countquotinglevels(const char *string, int max_white, int max_alpha);
+int strutil_countquotinglevels(const wxChar *string, int max_white, int max_alpha);
@@ -180,5 +180,5 @@
chars will be returned (where 'h' and 'l' stand for short and long int).
*/
-String strutil_extract_formatspec(const char *format);
+String strutil_extract_formatspec(const wxChar *format);
/// extracts the last path component from a path
Index: sysutil.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/sysutil.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -b -u -2 -r1.7 -r1.8
--- sysutil.h 12 Sep 2002 02:36:48 -0000 1.7
+++ sysutil.h 13 Sep 2002 01:27:46 -0000 1.8
@@ -59,5 +59,5 @@
if ( !m_ok && !!m_name ) // "!!" means "not empty"
{
- if ( remove(m_name) != 0 )
+ if ( wxRemove(m_name) != 0 )
{
wxLogDebug(_T("Stale temp file '%s' left."), m_name.c_str());
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
