Some Unicode fixes (mostly for Borland's pickiness regarding _T(), which

might be considered a good thing anyway).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2252 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/docmdi.cpp b/src/common/docmdi.cpp
index e188c03a1238b26521bb90a7fe4840df4ce7c64f..6e92c70f57f174dfe3fbda1f35052486af35bee0 100644 (file)
--- a/src/common/docmdi.cpp
+++ b/src/common/docmdi.cpp
@@ -59,7 +59,7 @@ void wxDocMDIParentFrame::OnExit(wxCommandEvent& WXUNUSED(event))
 void wxDocMDIParentFrame::OnMRUFile(wxCommandEvent& event)
 {
       wxString f(m_docManager->GetHistoryFile(event.GetSelection() - wxID_FILE1));
 void wxDocMDIParentFrame::OnMRUFile(wxCommandEvent& event)
 {
       wxString f(m_docManager->GetHistoryFile(event.GetSelection() - wxID_FILE1));

-      if (f != "")
+      if (f != _T(""))

         (void)m_docManager->CreateDocument(f, wxDOC_SILENT);
 }
 
         (void)m_docManager->CreateDocument(f, wxDOC_SILENT);
 }
 

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index 056ca6f48ed5ac3eeea1032afe3cbab68492355c..00c7bcc466bec700f57b75edb0c7e36653379c1d 100644 (file)
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -39,7 +39,7 @@
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/dc.h"
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/dc.h"

-#include "wx/dialog.h"
+    #include "wx/dialog.h"

     #include "wx/menu.h"
     #include "wx/list.h"
     #include "wx/filedlg.h"
     #include "wx/menu.h"
     #include "wx/list.h"
     #include "wx/filedlg.h"


@@ -213,7 +213,7 @@ bool wxDocument::Save()
     bool ret = FALSE;
 
     if (!IsModified()) return TRUE;
     bool ret = FALSE;
 
     if (!IsModified()) return TRUE;

-    if (m_documentFile == "" || !m_savedYet)
+    if (m_documentFile == _T("") || !m_savedYet)

         ret = SaveAs();
     else
         ret = OnSaveDocument(m_documentFile);
         ret = SaveAs();
     else
         ret = OnSaveDocument(m_documentFile);


@@ -245,7 +245,7 @@ bool wxDocument::SaveAs()
     wxString ext("");
     wxSplitPath(fileName, & path, & name, & ext);
 
     wxString ext("");
     wxSplitPath(fileName, & path, & name, & ext);
 

-    if (ext.IsEmpty() || ext == "")
+    if (ext.IsEmpty() || ext == _T(""))

     {
         fileName += ".";
         fileName += docTemplate->GetDefaultExtension();
     {
         fileName += ".";
         fileName += docTemplate->GetDefaultExtension();


@@ -274,7 +274,7 @@ bool wxDocument::OnSaveDocument(const wxString& file)
         return FALSE;
 
     wxString msgTitle;
         return FALSE;
 
     wxString msgTitle;

-    if (wxTheApp->GetAppName() != "")
+    if (wxTheApp->GetAppName() != _T(""))

         msgTitle = wxTheApp->GetAppName();
     else
         msgTitle = wxString(_("File error"));
         msgTitle = wxTheApp->GetAppName();
     else
         msgTitle = wxString(_("File error"));


@@ -305,7 +305,7 @@ bool wxDocument::OnOpenDocument(const wxString& file)
         return FALSE;
 
     wxString msgTitle;
         return FALSE;
 
     wxString msgTitle;

-    if (wxTheApp->GetAppName() != "")
+    if (wxTheApp->GetAppName() != _T(""))

         msgTitle = wxTheApp->GetAppName();
     else
         msgTitle = wxString(_("File error"));
         msgTitle = wxTheApp->GetAppName();
     else
         msgTitle = wxString(_("File error"));


@@ -355,12 +355,12 @@ bool wxDocument::Revert()
 // Get title, or filename if no title, else unnamed
 bool wxDocument::GetPrintableName(wxString& buf) const
 {
 // Get title, or filename if no title, else unnamed
 bool wxDocument::GetPrintableName(wxString& buf) const
 {

-    if (m_documentTitle != "")
+    if (m_documentTitle != _T(""))

     {
         buf = m_documentTitle;
         return TRUE;
     }
     {
         buf = m_documentTitle;
         return TRUE;
     }

-    else if (m_documentFile != "")
+    else if (m_documentFile != _T(""))

     {
         buf = wxFileNameFromPath(m_documentFile);
         return TRUE;
     {
         buf = wxFileNameFromPath(m_documentFile);
         return TRUE;


@@ -395,7 +395,7 @@ bool wxDocument::OnSaveModified()
         GetPrintableName(title);
 
         wxString msgTitle;
         GetPrintableName(title);
 
         wxString msgTitle;

-        if (wxTheApp->GetAppName() != "")
+        if (wxTheApp->GetAppName() != _T(""))

             msgTitle = wxTheApp->GetAppName();
         else
             msgTitle = wxString(_("Warning"));
             msgTitle = wxTheApp->GetAppName();
         else
             msgTitle = wxString(_("Warning"));


@@ -947,8 +947,8 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
     // Existing document
     wxDocTemplate *temp = (wxDocTemplate *) NULL;
 
     // Existing document
     wxDocTemplate *temp = (wxDocTemplate *) NULL;
 

-    wxString path2("");
-    if (path != "")
+    wxString path2(_T(""));
+    if (path != _T(""))

         path2 = path;
 
     if (flags & wxDOC_SILENT)
         path2 = path;
 
     if (flags & wxDOC_SILENT)


@@ -1199,7 +1199,7 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
     }
     else
     {
     }
     else
     {

-        path = "";
+        path = _T("");

         return (wxDocTemplate *) NULL;
     }
 #if 0
         return (wxDocTemplate *) NULL;
     }
 #if 0


@@ -1210,7 +1210,7 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
     if (!temp)
         return (wxDocTemplate *) NULL;
 
     if (!temp)
         return (wxDocTemplate *) NULL;
 

-    char *pathTmp = wxFileSelector(_("Select a file"), "", "",
+    wxChar *pathTmp = wxFileSelector(_("Select a file"), _T(""), _T(""),

             temp->GetDefaultExtension(),
             temp->GetFileFilter(),
             0, wxTheApp->GetTopWindow());
             temp->GetDefaultExtension(),
             temp->GetFileFilter(),
             0, wxTheApp->GetTopWindow());


@@ -1271,7 +1271,7 @@ wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates,
     int n = 0;
     for (i = 0; i < noTemplates; i++)
     {
     int n = 0;
     for (i = 0; i < noTemplates; i++)
     {

-        if (templates[i]->IsVisible() && (templates[i]->GetViewName() != ""))
+        if (templates[i]->IsVisible() && (templates[i]->GetViewName() != _T("")))

         {
             strings[n] = WXSTRINGCAST templates[i]->m_viewTypeName;
             data[n] = (wxChar *)templates[i];
         {
             strings[n] = WXSTRINGCAST templates[i]->m_viewTypeName;
             data[n] = (wxChar *)templates[i];


@@ -1445,7 +1445,7 @@ void wxDocParentFrame::OnExit(wxCommandEvent& WXUNUSED(event))
 void wxDocParentFrame::OnMRUFile(wxCommandEvent& event)
 {
     wxString f(m_docManager->GetHistoryFile(event.GetSelection() - wxID_FILE1));
 void wxDocParentFrame::OnMRUFile(wxCommandEvent& event)
 {
     wxString f(m_docManager->GetHistoryFile(event.GetSelection() - wxID_FILE1));

-    if (f != "")
+    if (f != _T(""))

         (void)m_docManager->CreateDocument(f, wxDOC_SILENT);
 }
 
         (void)m_docManager->CreateDocument(f, wxDOC_SILENT);
 }
 


@@ -1690,7 +1690,7 @@ void wxCommandProcessor::SetMenuStrings()
         {
             wxCommand *command = (wxCommand *)m_currentCommand->Data();
             wxString commandName(command->GetName());
         {
             wxCommand *command = (wxCommand *)m_currentCommand->Data();
             wxString commandName(command->GetName());

-            if (commandName == "") commandName = _("Unnamed command");
+            if (commandName == _T("")) commandName = _("Unnamed command");

             bool canUndo = command->CanUndo();
             if (canUndo)
                 buf = wxString(_("&Undo ")) + commandName;
             bool canUndo = command->CanUndo();
             if (canUndo)
                 buf = wxString(_("&Undo ")) + commandName;


@@ -1705,7 +1705,7 @@ void wxCommandProcessor::SetMenuStrings()
             {
                 wxCommand *redoCommand = (wxCommand *)m_currentCommand->Next()->Data();
                 wxString redoCommandName(redoCommand->GetName());
             {
                 wxCommand *redoCommand = (wxCommand *)m_currentCommand->Next()->Data();
                 wxString redoCommandName(redoCommand->GetName());

-                if (redoCommandName == "") redoCommandName = _("Unnamed command");
+                if (redoCommandName == _T("")) redoCommandName = _("Unnamed command");

                 buf = wxString(_("&Redo ")) + redoCommandName;
                 m_commandEditMenu->SetLabel(wxID_REDO, buf);
                 m_commandEditMenu->Enable(wxID_REDO, TRUE);
                 buf = wxString(_("&Redo ")) + redoCommandName;
                 m_commandEditMenu->SetLabel(wxID_REDO, buf);
                 m_commandEditMenu->Enable(wxID_REDO, TRUE);


@@ -1732,7 +1732,7 @@ void wxCommandProcessor::SetMenuStrings()
                 // we've undone to the start of the list, but can redo the first.
                 wxCommand *redoCommand = (wxCommand *)m_commands.First()->Data();
                 wxString redoCommandName(redoCommand->GetName());
                 // we've undone to the start of the list, but can redo the first.
                 wxCommand *redoCommand = (wxCommand *)m_commands.First()->Data();
                 wxString redoCommandName(redoCommand->GetName());

-                if (redoCommandName == "") redoCommandName = _("Unnamed command");
+                if (redoCommandName == _T("")) redoCommandName = _("Unnamed command");

                 buf = wxString(_("&Redo ")) + redoCommandName;
                 m_commandEditMenu->SetLabel(wxID_REDO, buf);
                 m_commandEditMenu->Enable(wxID_REDO, TRUE);
                 buf = wxString(_("&Redo ")) + redoCommandName;
                 m_commandEditMenu->SetLabel(wxID_REDO, buf);
                 m_commandEditMenu->Enable(wxID_REDO, TRUE);


@@ -1854,7 +1854,7 @@ void wxFileHistory::Load(wxConfigBase& config)
     wxString buf;
     buf.Printf(_T("file%d"), m_fileHistoryN+1);
     wxString historyFile;
     wxString buf;
     buf.Printf(_T("file%d"), m_fileHistoryN+1);
     wxString historyFile;

-    while ((m_fileHistoryN <= m_fileMaxFiles) && config.Read(buf, &historyFile) && (historyFile != ""))
+    while ((m_fileHistoryN <= m_fileMaxFiles) && config.Read(buf, &historyFile) && (historyFile != _T("")))

     {
         m_fileHistory[m_fileHistoryN] = copystring((const wxChar*) historyFile);
         m_fileHistoryN ++;
     {
         m_fileHistory[m_fileHistoryN] = copystring((const wxChar*) historyFile);
         m_fileHistoryN ++;

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 0155530824a7e82ccd534084e7521ed0b63af9d2..51d2877c20e299c75a858ce6bf62c58ae31dd66c 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -277,7 +277,7 @@ bool wxFileExists(const char *pszFileName)
 bool
 wxIsAbsolutePath (const wxString& filename)
 {
 bool
 wxIsAbsolutePath (const wxString& filename)
 {

-  if (filename != "")
+  if (filename != _T(""))

     {
       if (filename[0] == _T('/')
 #ifdef __VMS__
     {
       if (filename[0] == _T('/')
 #ifdef __VMS__


@@ -721,7 +721,7 @@ wxPathOnly (wxChar *path)
 // Return just the directory, or NULL if no directory
 wxString wxPathOnly (const wxString& path)
 {
 // Return just the directory, or NULL if no directory
 wxString wxPathOnly (const wxString& path)
 {

-  if (path != "")
+  if (path != _T(""))

     {
       wxChar buf[_MAXPATHLEN];
 
     {
       wxChar buf[_MAXPATHLEN];
 

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index 154c2c700873a3e28fadf92e258cb327f9109a9e..fa54d946b12852df015672e0e8df493aa30f1caf 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -601,7 +601,7 @@ wxFont *wxFontList::
           //          each_font->GetFontId () == FamilyOrFontId) /* New font system */
           //#else
           each_font->GetFamily () == FamilyOrFontId &&
           //          each_font->GetFontId () == FamilyOrFontId) /* New font system */
           //#else
           each_font->GetFamily () == FamilyOrFontId &&

-          ((each_font->GetFaceName() == "") || each_font->GetFaceName() == Face))
+          ((each_font->GetFaceName() == _T("")) || each_font->GetFaceName() == Face))

         //#endif
         return each_font;
     }
         //#endif
         return each_font;
     }

diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp
index 68acc2401392a5ac30882bde6d125de5a1953073..f985d439d1999d146739dd513cff8c678d650ce8 100644 (file)
--- a/src/common/wxchar.cpp
+++ b/src/common/wxchar.cpp
@@ -39,6 +39,7 @@
   #include "wx/hash.h"
 #endif
 
   #include "wx/hash.h"
 #endif
 

+#if wxUSE_WCHAR_T

 size_t wxMB2WC(wchar_t *buf, const char *psz, size_t n)
 {
   if (buf) {
 size_t wxMB2WC(wchar_t *buf, const char *psz, size_t n)
 {
   if (buf) {


@@ -83,6 +84,7 @@ size_t wxWC2MB(char *buf, const wchar_t *pwz, size_t n)
   return wcstombs((char *) NULL, pwz, 0);
 #endif // GNU
 }
   return wcstombs((char *) NULL, pwz, 0);
 #endif // GNU
 }

+#endif

 
 #ifndef wxStrdup
 wxChar * WXDLLEXPORT wxStrdup(const wxChar *psz)
 
 #ifndef wxStrdup
 wxChar * WXDLLEXPORT wxStrdup(const wxChar *psz)


@@ -94,6 +96,18 @@ wxChar * WXDLLEXPORT wxStrdup(const wxChar *psz)
 }
 #endif
 
 }
 #endif
 

+#ifndef wxStricmp
+int WXDLLEXPORT wxStricmp(const wxChar *psz1, const wxChar *psz2)
+{
+  register wxChar c1, c2;
+  do {
+    c1 = wxTolower(*psz1++);
+    c2 = wxTolower(*psz2++);
+  } while ( c1 && (c1 == c2) );
+  return c1 - c2;
+}
+#endif
+

 #ifndef wxStrtok
 wxChar * WXDLLEXPORT wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_ptr)
 {
 #ifndef wxStrtok
 wxChar * WXDLLEXPORT wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_ptr)
 {