Update of /cvsroot/mahogany/M/include/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv26965/include/gui
Modified Files:
wxComposeView.h wxFolderTree.h wxMFrame.h wxMainFrame.h
wxOptionsPage.h wxllist.h wxlwindow.h
Log Message:
unicode fixes
Index: wxComposeView.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxComposeView.h,v
retrieving revision 1.94
retrieving revision 1.95
diff -b -u -2 -r1.94 -r1.95
--- wxComposeView.h 6 Oct 2003 00:36:25 -0000 1.94
+++ wxComposeView.h 11 Oct 2003 23:13:45 -0000 1.95
@@ -95,12 +95,12 @@
virtual void InitText(Message *msg = NULL, const MessageView *msgview = NULL);
virtual void Launch();
- virtual void InsertFile(const char *filename = NULL,
- const char *mimetype = NULL);
+ virtual void InsertFile(const wxChar *filename = NULL,
+ const wxChar *mimetype = NULL);
virtual void InsertData(void *data,
size_t length,
- const char *mimetype = NULL,
- const char *name = NULL,
- const char *filename = NULL);
+ const wxChar *mimetype = NULL,
+ const wxChar *name = NULL,
+ const wxChar *filename = NULL);
virtual void InsertText(const String &txt);
@@ -271,5 +271,5 @@
/// InsertData() and InsertFile() helper
- void DoInsertAttachment(EditorContentPart *mc, const char *mimetype);
+ void DoInsertAttachment(EditorContentPart *mc, const wxChar *mimetype);
/// set encoding to use
Index: wxFolderTree.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxFolderTree.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -b -u -2 -r1.18 -r1.19
--- wxFolderTree.h 18 Sep 2003 16:30:44 -0000 1.18
+++ wxFolderTree.h 11 Oct 2003 23:13:46 -0000 1.19
@@ -100,5 +100,5 @@
virtual bool OnRename(MFolder *folder,
const String& folderNewName,
- const String& mboxNewName = "");
+ const String& mboxNewName = _T(""));
// user wants to move this folder to a new parent, return TRUE if ok
virtual bool OnMove(MFolder *folder,
Index: wxMFrame.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxMFrame.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -b -u -2 -r1.42 -r1.43
--- wxMFrame.h 18 Sep 2003 16:30:44 -0000 1.42
+++ wxMFrame.h 11 Oct 2003 23:13:46 -0000 1.43
@@ -44,11 +44,11 @@
// initialized, they will receive some values in any case), returns FALSE
// if there is no config object to read settings from
- static bool RestorePosition(const char *name,
+ static bool RestorePosition(const wxChar *name,
int *x, int *y, int *w, int *h,
bool *iconised = NULL, bool *maximised = NULL);
// save the given frame's position and size in config file
- static void SavePosition(const char *name, wxFrame *frame);
- static void SavePosition(const char *name, wxWindow *frame);
+ static void SavePosition(const wxChar *name, wxFrame *frame);
+ static void SavePosition(const wxChar *name, wxWindow *frame);
/// dummy ctor for DECLARE_DYNAMIC_CLASS
@@ -109,5 +109,5 @@
protected:
- static void SavePositionInternal(const char *name, wxWindow *frame, bool isFrame);
+ static void SavePositionInternal(const wxChar *name, wxWindow *frame, bool
isFrame);
/// is it initialised?
Index: wxMainFrame.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxMainFrame.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -b -u -2 -r1.43 -r1.44
--- wxMainFrame.h 18 Sep 2003 16:30:44 -0000 1.43
+++ wxMainFrame.h 11 Oct 2003 23:13:46 -0000 1.44
@@ -71,12 +71,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);
/// 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);
Index: wxOptionsPage.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxOptionsPage.h,v
retrieving revision 1.63
retrieving revision 1.64
diff -b -u -2 -r1.63 -r1.64
--- wxOptionsPage.h 27 Sep 2003 23:14:26 -0000 1.63
+++ wxOptionsPage.h 11 Oct 2003 23:13:46 -0000 1.64
@@ -48,20 +48,20 @@
struct ConfigValueDefault
{
- ConfigValueDefault(const char *name_, long value)
+ ConfigValueDefault(const wxChar *name_, long value)
{ bNumeric = TRUE; name = name_; lValue = value; }
- ConfigValueDefault(const char *name_, const char *value)
+ ConfigValueDefault(const wxChar *name_, const wxChar *value)
{ bNumeric = FALSE; name = name_; szValue = value; }
long GetLong() const { wxASSERT( bNumeric ); return lValue; }
- const char *GetString() const { wxASSERT( !bNumeric ); return szValue; }
+ const wxChar *GetString() const { wxASSERT( !bNumeric ); return szValue; }
bool IsNumeric() const { return bNumeric; }
- const char *name;
+ const wxChar *name;
union
{
long lValue;
- const char *szValue;
+ const wxChar *szValue;
};
bool bNumeric;
@@ -70,5 +70,5 @@
struct ConfigValueNone : public ConfigValueDefault
{
- ConfigValueNone() : ConfigValueDefault("",0L) { }
+ ConfigValueNone() : ConfigValueDefault(_T(""),0L) { }
};
@@ -121,5 +121,5 @@
struct FieldInfo
{
- const char *label; // which is shown in the dialog
+ const wxChar *label; // which is shown in the dialog
int flags; // containts the type and the flags (see above)
int enable; // disable this field if "enable" field is unchecked
@@ -141,5 +141,5 @@
size_t nFirst, size_t nLast,
wxNotebook *parent,
- const char *title,
+ const wxChar *title,
Profile *profile,
int helpID = -1,
@@ -291,5 +291,5 @@
// nLast in ms_aFields
wxOptionsPageStandard(wxNotebook *parent,
- const char *title,
+ const wxChar *title,
Profile *profile,
int nFirst,
@@ -324,5 +324,5 @@
// the aFields array contains the controls descriptions
wxOptionsPageDynamic(wxNotebook *parent,
- const char *title,
+ const wxChar *title,
Profile *profile,
FieldInfoArray aFields,
@@ -347,6 +347,6 @@
}
- wxOptionsPageDesc(const char *title_,
- const char *image_,
+ wxOptionsPageDesc(const wxChar *title_,
+ const wxChar *image_,
int helpId_,
const wxOptionsPage::FieldInfo *aFields_,
Index: wxllist.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxllist.h,v
retrieving revision 1.81
retrieving revision 1.82
diff -b -u -2 -r1.81 -r1.82
--- wxllist.h 18 Sep 2003 16:30:44 -0000 1.81
+++ wxllist.h 11 Oct 2003 23:13:46 -0000 1.82
@@ -263,5 +263,5 @@
{
public:
- wxLayoutObjectText(const wxString &txt = "");
+ wxLayoutObjectText(const wxString &txt = _T(""));
virtual wxLayoutObjectType GetType(void) const { return WXLO_TYPE_TEXT; }
@@ -294,5 +294,5 @@
#endif
- virtual CoordType GetLength(void) const { return strlen(m_Text.c_str()); }
+ virtual CoordType GetLength(void) const { return wxStrlen(m_Text.c_str()); }
// for editing:
@@ -986,6 +986,6 @@
void SetFont(int family=-1, int size = -1, int style=-1,
int weight=-1, int underline = -1,
- char const *fg = NULL,
- char const *bg = NULL,
+ wxChar const *fg = NULL,
+ wxChar const *bg = NULL,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
@@ -1011,5 +1011,5 @@
{ SetFont(-1,-1,-1,-1,-1,(wxColour *)NULL,(wxColour *)NULL,enc); }
/// set font colours by name
- inline void SetFontColour(char const *fg, char const *bg = NULL)
+ inline void SetFontColour(wxChar const *fg, wxChar const *bg = NULL)
{ SetFont(-1,-1,-1,-1,-1,fg,bg); }
/// set font colours by colour
@@ -1323,5 +1323,5 @@
wxLayoutDataObject()
{
- SetFormat("application/wxlayoutlist");
+ SetFormat(_T("application/wxlayoutlist"));
}
@@ -1329,5 +1329,5 @@
void SetLayoutData(const wxString& text)
{ SetData(text.length() + 1, text.c_str()); }
- const char *GetLayoutData() const { return (const char *)GetData(); }
+ const wxChar *GetLayoutData() const { return (const wxChar *)GetData(); }
DECLARE_NO_COPY_CLASS(wxLayoutDataObject)
Index: wxlwindow.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxlwindow.h,v
retrieving revision 1.52
retrieving revision 1.53
diff -b -u -2 -r1.52 -r1.53
--- wxlwindow.h 18 Sep 2003 16:30:45 -0000 1.52
+++ wxlwindow.h 11 Oct 2003 23:13:46 -0000 1.53
@@ -115,5 +115,5 @@
bool Find(const wxString &needle,
wxPoint * fromWhere = NULL,
- const wxString &configPath = "MsgViewFindString");
+ const wxString &configPath = _T("MsgViewFindString"));
/// find the same string again
bool FindAgain(void);
-------------------------------------------------------
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
