Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
might be considered a good thing anyway).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2252 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ove Kaaven
1999-04-20 11:08:02 +00:00
parent 554936c829
commit d0bdc3ca5f
5 changed files with 36 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/docmdi.cpp
View File

@@ -59,7 +59,7 @@ void wxDocMDIParentFrame::OnExit(wxCommandEvent& WXUNUSED(event))
void wxDocMDIParentFrame::OnMRUFile(wxCommandEvent& event) void wxDocMDIParentFrame::OnMRUFile(wxCommandEvent& event)
{ {
wxString f(m_docManager->GetHistoryFile(event.GetSelection() - wxID_FILE1)); 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);
} }

36
src/common/docview.cpp
View File

@@ -39,7 +39,7 @@
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/app.h" #include "wx/app.h"
#include "wx/dc.h" #include "wx/dc.h"
#include "wx/dialog.h" #include "wx/dialog.h"
#include "wx/menu.h" #include "wx/menu.h"
#include "wx/list.h" #include "wx/list.h"
#include "wx/filedlg.h" #include "wx/filedlg.h"
@@ -213,7 +213,7 @@ bool wxDocument::Save()
bool ret = FALSE; bool ret = FALSE;
if (!IsModified()) return TRUE; if (!IsModified()) return TRUE;
if (m_documentFile == "" || !m_savedYet) if (m_documentFile == _T("") || !m_savedYet)
ret = SaveAs(); ret = SaveAs();
else else
ret = OnSaveDocument(m_documentFile); ret = OnSaveDocument(m_documentFile);
@@ -245,7 +245,7 @@ bool wxDocument::SaveAs()
wxString ext(""); wxString ext("");
wxSplitPath(fileName, & path, & name, & ext); wxSplitPath(fileName, & path, & name, & ext);
if (ext.IsEmpty() || ext == "") if (ext.IsEmpty() || ext == _T(""))
{ {
fileName += "."; fileName += ".";
fileName += docTemplate->GetDefaultExtension(); fileName += docTemplate->GetDefaultExtension();
@@ -274,7 +274,7 @@ bool wxDocument::OnSaveDocument(const wxString& file)
return FALSE; return FALSE;
wxString msgTitle; wxString msgTitle;
if (wxTheApp->GetAppName() != "") if (wxTheApp->GetAppName() != _T(""))
msgTitle = wxTheApp->GetAppName(); msgTitle = wxTheApp->GetAppName();
else else
msgTitle = wxString(_("File error")); msgTitle = wxString(_("File error"));
@@ -305,7 +305,7 @@ bool wxDocument::OnOpenDocument(const wxString& file)
return FALSE; return FALSE;
wxString msgTitle; wxString msgTitle;
if (wxTheApp->GetAppName() != "") if (wxTheApp->GetAppName() != _T(""))
msgTitle = wxTheApp->GetAppName(); msgTitle = wxTheApp->GetAppName();
else else
msgTitle = wxString(_("File error")); msgTitle = wxString(_("File error"));
@@ -355,12 +355,12 @@ bool wxDocument::Revert()
// Get title, or filename if no title, else unnamed // Get title, or filename if no title, else unnamed
bool wxDocument::GetPrintableName(wxString& buf) const bool wxDocument::GetPrintableName(wxString& buf) const
{ {
if (m_documentTitle != "") if (m_documentTitle != _T(""))
{ {
buf = m_documentTitle; buf = m_documentTitle;
return TRUE; return TRUE;
} }
else if (m_documentFile != "") else if (m_documentFile != _T(""))
{ {
buf = wxFileNameFromPath(m_documentFile); buf = wxFileNameFromPath(m_documentFile);
return TRUE; return TRUE;
@@ -395,7 +395,7 @@ bool wxDocument::OnSaveModified()
GetPrintableName(title); GetPrintableName(title);
wxString msgTitle; wxString msgTitle;
if (wxTheApp->GetAppName() != "") if (wxTheApp->GetAppName() != _T(""))
msgTitle = wxTheApp->GetAppName(); msgTitle = wxTheApp->GetAppName();
else else
msgTitle = wxString(_("Warning")); msgTitle = wxString(_("Warning"));
@@ -947,8 +947,8 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
// Existing document // Existing document
wxDocTemplate *temp = (wxDocTemplate *) NULL; wxDocTemplate *temp = (wxDocTemplate *) NULL;
wxString path2(""); wxString path2(_T(""));
if (path != "") if (path != _T(""))
path2 = path; path2 = path;
if (flags & wxDOC_SILENT) if (flags & wxDOC_SILENT)
@@ -1199,7 +1199,7 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
} }
else else
{ {
path = ""; path = _T("");
return (wxDocTemplate *) NULL; return (wxDocTemplate *) NULL;
} }
#if 0 #if 0
@@ -1210,7 +1210,7 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
if (!temp) if (!temp)
return (wxDocTemplate *) NULL; return (wxDocTemplate *) NULL;
char *pathTmp = wxFileSelector(_("Select a file"), "", "", wxChar *pathTmp = wxFileSelector(_("Select a file"), _T(""), _T(""),
temp->GetDefaultExtension(), temp->GetDefaultExtension(),
temp->GetFileFilter(), temp->GetFileFilter(),
0, wxTheApp->GetTopWindow()); 0, wxTheApp->GetTopWindow());
@@ -1271,7 +1271,7 @@ wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates,
int n = 0; int n = 0;
for (i = 0; i < noTemplates; i++) 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; strings[n] = WXSTRINGCAST templates[i]->m_viewTypeName;
data[n] = (wxChar *)templates[i]; data[n] = (wxChar *)templates[i];
@@ -1445,7 +1445,7 @@ void wxDocParentFrame::OnExit(wxCommandEvent& WXUNUSED(event))
void wxDocParentFrame::OnMRUFile(wxCommandEvent& event) void wxDocParentFrame::OnMRUFile(wxCommandEvent& event)
{ {
wxString f(m_docManager->GetHistoryFile(event.GetSelection() - wxID_FILE1)); 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(); wxCommand *command = (wxCommand *)m_currentCommand->Data();
wxString commandName(command->GetName()); wxString commandName(command->GetName());
if (commandName == "") commandName = _("Unnamed command"); if (commandName == _T("")) commandName = _("Unnamed command");
bool canUndo = command->CanUndo(); bool canUndo = command->CanUndo();
if (canUndo) if (canUndo)
buf = wxString(_("&Undo ")) + commandName; buf = wxString(_("&Undo ")) + commandName;
@@ -1705,7 +1705,7 @@ void wxCommandProcessor::SetMenuStrings()
{ {
wxCommand *redoCommand = (wxCommand *)m_currentCommand->Next()->Data(); wxCommand *redoCommand = (wxCommand *)m_currentCommand->Next()->Data();
wxString redoCommandName(redoCommand->GetName()); wxString redoCommandName(redoCommand->GetName());
if (redoCommandName == "") redoCommandName = _("Unnamed command"); if (redoCommandName == _T("")) redoCommandName = _("Unnamed command");
buf = wxString(_("&Redo ")) + redoCommandName; buf = wxString(_("&Redo ")) + redoCommandName;
m_commandEditMenu->SetLabel(wxID_REDO, buf); m_commandEditMenu->SetLabel(wxID_REDO, buf);
m_commandEditMenu->Enable(wxID_REDO, TRUE); 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. // we've undone to the start of the list, but can redo the first.
wxCommand *redoCommand = (wxCommand *)m_commands.First()->Data(); wxCommand *redoCommand = (wxCommand *)m_commands.First()->Data();
wxString redoCommandName(redoCommand->GetName()); wxString redoCommandName(redoCommand->GetName());
if (redoCommandName == "") redoCommandName = _("Unnamed command"); if (redoCommandName == _T("")) redoCommandName = _("Unnamed command");
buf = wxString(_("&Redo ")) + redoCommandName; buf = wxString(_("&Redo ")) + redoCommandName;
m_commandEditMenu->SetLabel(wxID_REDO, buf); m_commandEditMenu->SetLabel(wxID_REDO, buf);
m_commandEditMenu->Enable(wxID_REDO, TRUE); m_commandEditMenu->Enable(wxID_REDO, TRUE);
@@ -1854,7 +1854,7 @@ void wxFileHistory::Load(wxConfigBase& config)
wxString buf; wxString buf;
buf.Printf(_T("file%d"), m_fileHistoryN+1); buf.Printf(_T("file%d"), m_fileHistoryN+1);
wxString historyFile; 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_fileHistory[m_fileHistoryN] = copystring((const wxChar*) historyFile);
m_fileHistoryN ++; m_fileHistoryN ++;

4
src/common/filefn.cpp
View File

@@ -277,7 +277,7 @@ bool wxFileExists(const char *pszFileName)
bool bool
wxIsAbsolutePath (const wxString& filename) wxIsAbsolutePath (const wxString& filename)
{ {
if (filename != "") if (filename != _T(""))
{ {
if (filename[0] == _T('/') if (filename[0] == _T('/')
#ifdef __VMS__ #ifdef __VMS__
@@ -721,7 +721,7 @@ wxPathOnly (wxChar *path)
// Return just the directory, or NULL if no directory // Return just the directory, or NULL if no directory
wxString wxPathOnly (const wxString& path) wxString wxPathOnly (const wxString& path)
{ {
if (path != "") if (path != _T(""))
{ {
wxChar buf[_MAXPATHLEN]; wxChar buf[_MAXPATHLEN];

2
src/common/gdicmn.cpp
View File

@@ -601,7 +601,7 @@ wxFont *wxFontList::
// each_font->GetFontId () == FamilyOrFontId) /* New font system */ // each_font->GetFontId () == FamilyOrFontId) /* New font system */
//#else //#else
each_font->GetFamily () == FamilyOrFontId && each_font->GetFamily () == FamilyOrFontId &&
((each_font->GetFaceName() == "") || each_font->GetFaceName() == Face)) ((each_font->GetFaceName() == _T("")) || each_font->GetFaceName() == Face))
//#endif //#endif
return each_font; return each_font;
} }

14
src/common/wxchar.cpp
View File

@@ -39,6 +39,7 @@
#include "wx/hash.h" #include "wx/hash.h"
#endif #endif
#if wxUSE_WCHAR_T
size_t wxMB2WC(wchar_t *buf, const char *psz, size_t n) size_t wxMB2WC(wchar_t *buf, const char *psz, size_t n)
{ {
if (buf) { if (buf) {
@@ -83,6 +84,7 @@ size_t wxWC2MB(char *buf, const wchar_t *pwz, size_t n)
return wcstombs((char *) NULL, pwz, 0); return wcstombs((char *) NULL, pwz, 0);
#endif // GNU #endif // GNU
} }
#endif
#ifndef wxStrdup #ifndef wxStrdup
wxChar * WXDLLEXPORT wxStrdup(const wxChar *psz) 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 #ifndef wxStrtok
wxChar * WXDLLEXPORT wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_ptr) wxChar * WXDLLEXPORT wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_ptr)
{ {