IRIX compile fixes

[wxWidgets.git] / src / common / docview.cpp

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index deb427173512c64880f72812e03c9f6e84790f84..ece6ec34a4c61a284bce669a34512105dd98028c 100644 (file)
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -43,7 +43,7 @@
     #include "wx/menu.h"
     #include "wx/list.h"
     #include "wx/filedlg.h"
     #include "wx/menu.h"
     #include "wx/list.h"
     #include "wx/filedlg.h"

-    #include <wx/intl.h>
+    #include "wx/intl.h"

 #endif
 
 #ifdef __WXGTK__
 #endif
 
 #ifdef __WXGTK__


@@ -53,6 +53,7 @@
 #include "wx/msgdlg.h"
 #include "wx/choicdlg.h"
 #include "wx/docview.h"
 #include "wx/msgdlg.h"
 #include "wx/choicdlg.h"
 #include "wx/docview.h"

+#include "wx/prntbase.h"

 #include "wx/printdlg.h"
 #include "wx/confbase.h"
 
 #include "wx/printdlg.h"
 #include "wx/confbase.h"
 


@@ -92,7 +93,7 @@
 // function prototypes
 // ----------------------------------------------------------------------------
 
 // function prototypes
 // ----------------------------------------------------------------------------
 

-static inline wxString FindExtension(const char *path);
+static inline wxString FindExtension(const wxChar *path);

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -102,7 +103,7 @@ static inline wxString FindExtension(const char *path);
 // local functions
 // ----------------------------------------------------------------------------
 
 // local functions
 // ----------------------------------------------------------------------------
 

-static wxString FindExtension(const char *path)
+static wxString FindExtension(const wxChar *path)

 {
     wxString ext;
     wxSplitPath(path, NULL, NULL, &ext);
 {
     wxString ext;
     wxSplitPath(path, NULL, NULL, &ext);


@@ -178,14 +179,14 @@ bool wxDocument::DeleteAllViews()
     return TRUE;
 }
 
     return TRUE;
 }
 

-wxView *wxDocument::GetFirstView(void) const
+wxView *wxDocument::GetFirstView() const

 {
     if (m_documentViews.Number() == 0)
         return (wxView *) NULL;
     return (wxView *)m_documentViews.First()->Data();
 }
 
 {
     if (m_documentViews.Number() == 0)
         return (wxView *) NULL;
     return (wxView *)m_documentViews.First()->Data();
 }
 

-wxDocManager *wxDocument::GetDocumentManager(void) const
+wxDocManager *wxDocument::GetDocumentManager() const

 {
     return m_documentTemplate->GetDocumentManager();
 }
 {
     return m_documentTemplate->GetDocumentManager();
 }


@@ -213,7 +214,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);


@@ -240,12 +241,10 @@ bool wxDocument::SaveAs()
         return FALSE;
 
     wxString fileName(tmp);
         return FALSE;
 
     wxString fileName(tmp);

-    wxString path("");
-    wxString name("");
-    wxString ext("");
+    wxString path, name, ext;

     wxSplitPath(fileName, & path, & name, & ext);
 
     wxSplitPath(fileName, & path, & name, & ext);
 

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

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


@@ -274,12 +273,12 @@ 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"));
 

-    ofstream store(file);
+    ofstream store(file.fn_str());

     if (store.fail() || store.bad())
     {
         (void)wxMessageBox(_("Sorry, could not open this file for saving."), msgTitle, wxOK | wxICON_EXCLAMATION,
     if (store.fail() || store.bad())
     {
         (void)wxMessageBox(_("Sorry, could not open this file for saving."), msgTitle, wxOK | wxICON_EXCLAMATION,


@@ -305,12 +304,12 @@ 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"));
 

-    ifstream store(file);
+    ifstream store(file.fn_str());

     if (store.fail() || store.bad())
     {
         (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK|wxICON_EXCLAMATION,
     if (store.fail() || store.bad())
     {
         (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK|wxICON_EXCLAMATION,


@@ -355,12 +354,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;


@@ -372,7 +371,7 @@ bool wxDocument::GetPrintableName(wxString& buf) const
     }
 }
 
     }
 }
 

-wxWindow *wxDocument::GetDocumentWindow(void) const
+wxWindow *wxDocument::GetDocumentWindow() const

 {
     wxView *view = GetFirstView();
     if (view)
 {
     wxView *view = GetFirstView();
     if (view)


@@ -395,14 +394,14 @@ 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"));
 
         wxString prompt;
         prompt.Printf(_("Do you want to save changes to document %s?"),
             msgTitle = wxTheApp->GetAppName();
         else
             msgTitle = wxString(_("Warning"));
 
         wxString prompt;
         prompt.Printf(_("Do you want to save changes to document %s?"),

-                (const char *)title);
+                (const wxChar *)title);

         int res = wxMessageBox(prompt, msgTitle,
                 wxYES_NO|wxCANCEL|wxICON_QUESTION,
                 GetDocumentWindow());
         int res = wxMessageBox(prompt, msgTitle,
                 wxYES_NO|wxCANCEL|wxICON_QUESTION,
                 GetDocumentWindow());


@@ -576,7 +575,7 @@ wxPrintout *wxView::OnCreatePrintout()
 {
     return new wxDocPrintout(this);
 }
 {
     return new wxDocPrintout(this);
 }

-#endif
+#endif // wxUSE_PRINTING_ARCHITECTURE

 
 // ----------------------------------------------------------------------------
 // wxDocTemplate
 
 // ----------------------------------------------------------------------------
 // wxDocTemplate


@@ -594,7 +593,6 @@ wxDocTemplate::wxDocTemplate(wxDocManager *manager,
                              long flags)
 {
     m_documentManager = manager;
                              long flags)
 {
     m_documentManager = manager;

-    m_flags = flags;

     m_description = descr;
     m_directory = dir;
     m_defaultExt = ext;
     m_description = descr;
     m_directory = dir;
     m_defaultExt = ext;


@@ -650,6 +648,13 @@ wxView *wxDocTemplate::CreateView(wxDocument *doc, long flags)
     }
 }
 
     }
 }
 

+// The default (very primitive) format detection: check is the extension is
+// that of the template
+bool wxDocTemplate::FileMatchesTemplate(const wxString& path)
+{
+    return GetDefaultExtension().IsSameAs(FindExtension(path));
+}
+

 // ----------------------------------------------------------------------------
 // wxDocManager
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxDocManager
 // ----------------------------------------------------------------------------


@@ -781,6 +786,7 @@ void wxDocManager::OnFileSaveAs(wxCommandEvent& WXUNUSED(event))
 
 void wxDocManager::OnPrint(wxCommandEvent& WXUNUSED(event))
 {
 
 void wxDocManager::OnPrint(wxCommandEvent& WXUNUSED(event))
 {

+#if wxUSE_PRINTING_ARCHITECTURE

     wxView *view = GetCurrentView();
     if (!view)
         return;
     wxView *view = GetCurrentView();
     if (!view)
         return;


@@ -793,6 +799,7 @@ void wxDocManager::OnPrint(wxCommandEvent& WXUNUSED(event))
 
         delete printout;
     }
 
         delete printout;
     }

+#endif // wxUSE_PRINTING_ARCHITECTURE

 }
 
 void wxDocManager::OnPrintSetup(wxCommandEvent& WXUNUSED(event))
 }
 
 void wxDocManager::OnPrintSetup(wxCommandEvent& WXUNUSED(event))


@@ -811,6 +818,7 @@ void wxDocManager::OnPrintSetup(wxCommandEvent& WXUNUSED(event))
 
 void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event))
 {
 
 void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event))
 {

+#if wxUSE_PRINTING_ARCHITECTURE

     wxView *view = GetCurrentView();
     if (!view)
         return;
     wxView *view = GetCurrentView();
     if (!view)
         return;


@@ -828,6 +836,7 @@ void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event))
         frame->Initialize();
         frame->Show(TRUE);
     }
         frame->Initialize();
         frame->Show(TRUE);
     }

+#endif // wxUSE_PRINTING_ARCHITECTURE

 }
 
 void wxDocManager::OnUndo(wxCommandEvent& WXUNUSED(event))
 }
 
 void wxDocManager::OnUndo(wxCommandEvent& WXUNUSED(event))


@@ -848,7 +857,7 @@ void wxDocManager::OnRedo(wxCommandEvent& WXUNUSED(event))
         doc->GetCommandProcessor()->Redo();
 }
 
         doc->GetCommandProcessor()->Redo();
 }
 

-wxView *wxDocManager::GetCurrentView(void) const
+wxView *wxDocManager::GetCurrentView() const

 {
     if (m_currentView)
         return m_currentView;
 {
     if (m_currentView)
         return m_currentView;


@@ -948,8 +957,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)


@@ -1035,7 +1044,7 @@ bool wxDocManager::FlushDoc(wxDocument *WXUNUSED(doc))
     return FALSE;
 }
 
     return FALSE;
 }
 

-wxDocument *wxDocManager::GetCurrentDocument(void) const
+wxDocument *wxDocManager::GetCurrentDocument() const

 {
     if (m_currentView)
         return m_currentView->GetDocument();
 {
     if (m_currentView)
         return m_currentView->GetDocument();


@@ -1113,7 +1122,7 @@ void wxDocManager::FileHistoryAddFilesToMenu()
         m_fileHistory->AddFilesToMenu();
 }
 
         m_fileHistory->AddFilesToMenu();
 }
 

-int wxDocManager::GetNoHistoryFiles(void) const
+int wxDocManager::GetNoHistoryFiles() const

 {
     if (m_fileHistory)
         return m_fileHistory->GetNoHistoryFiles();
 {
     if (m_fileHistory)
         return m_fileHistory->GetNoHistoryFiles();


@@ -1122,24 +1131,18 @@ int wxDocManager::GetNoHistoryFiles(void) const
 }
 
 
 }
 
 

-// Given a path, try to find a matching template. Won't always work, of
-// course.
+// Find out the document template via matching in the document file format
+// against that of the template

 wxDocTemplate *wxDocManager::FindTemplateForPath(const wxString& path)
 {
 wxDocTemplate *wxDocManager::FindTemplateForPath(const wxString& path)
 {

-    wxString theExt = FindExtension(path);
-    if (!theExt)
-        return (wxDocTemplate *) NULL;

     wxDocTemplate *theTemplate = (wxDocTemplate *) NULL;
 
     wxDocTemplate *theTemplate = (wxDocTemplate *) NULL;
 

-    if (m_templates.Number() == 1)
-        return (wxDocTemplate *)m_templates.First()->Data();
-

     // Find the template which this extension corresponds to
     int i;
     for (i = 0; i < m_templates.Number(); i++)
     {
         wxDocTemplate *temp = (wxDocTemplate *)m_templates.Nth(i)->Data();
     // Find the template which this extension corresponds to
     int i;
     for (i = 0; i < m_templates.Number(); i++)
     {
         wxDocTemplate *temp = (wxDocTemplate *)m_templates.Nth(i)->Data();

-        if (strcmp(temp->GetDefaultExtension(), theExt) == 0)
+        if ( temp->FileMatchesTemplate(path) )

         {
             theTemplate = temp;
             break;
         {
             theTemplate = temp;
             break;


@@ -1154,7 +1157,11 @@ wxDocTemplate *wxDocManager::FindTemplateForPath(const wxString& path)
 // template extension.
 
 wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
 // template extension.
 
 wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,

+#ifdef __WXMSW__

                                                 int noTemplates,
                                                 int noTemplates,

+#else
+                                                int WXUNUSED(noTemplates),
+#endif

                                                 wxString& path,
                                                 long WXUNUSED(flags),
                                                 bool WXUNUSED(save))
                                                 wxString& path,
                                                 long WXUNUSED(flags),
                                                 bool WXUNUSED(save))


@@ -1170,19 +1177,25 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
         {
             // add a '|' to separate this filter from the previous one
             if ( !descrBuf.IsEmpty() )
         {
             // add a '|' to separate this filter from the previous one
             if ( !descrBuf.IsEmpty() )

-                descrBuf << '|';
+                descrBuf << _T('|');

 
             descrBuf << templates[i]->GetDescription()
 
             descrBuf << templates[i]->GetDescription()

-                << " (" << templates[i]->GetFileFilter() << ") |"
+                << _T(" (") << templates[i]->GetFileFilter() << _T(") |")

                 << templates[i]->GetFileFilter();
         }
     }
 #else
                 << templates[i]->GetFileFilter();
         }
     }
 #else

-    wxString descrBuf = "*.*";
+    wxString descrBuf = _T("*.*");

 #endif
 
 #endif
 

-    wxString pathTmp = wxFileSelector(_("Select a file"), "", "", "",
-            descrBuf, 0, wxTheApp->GetTopWindow());
+    int FilterIndex = 0;
+    wxString pathTmp = wxFileSelectorEx(_("Select a file"),
+                                        _T(""),
+                                        _T(""),
+                                        &FilterIndex,
+                                        descrBuf,
+                                        0,
+                                        wxTheApp->GetTopWindow());

 
     if (!pathTmp.IsEmpty())
     {
 
     if (!pathTmp.IsEmpty())
     {


@@ -1196,11 +1209,14 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
         // one. We really want to know exactly which template was
         // chosen by using a more advanced file selector.
         wxDocTemplate *theTemplate = FindTemplateForPath(path);
         // one. We really want to know exactly which template was
         // chosen by using a more advanced file selector.
         wxDocTemplate *theTemplate = FindTemplateForPath(path);

+        if ( !theTemplate )
+            theTemplate = templates[FilterIndex];
+

         return theTemplate;
     }
     else
     {
         return theTemplate;
     }
     else
     {

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

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


@@ -1211,7 +1227,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());


@@ -1229,8 +1245,8 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
 wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
                                                 int noTemplates)
 {
 wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
                                                 int noTemplates)
 {

-    char **strings = new char *[noTemplates];
-    char **data = new char *[noTemplates];
+    wxChar **strings = new wxChar *[noTemplates];
+    wxChar **data = new wxChar *[noTemplates];

     int i;
     int n = 0;
     for (i = 0; i < noTemplates; i++)
     int i;
     int n = 0;
     for (i = 0; i < noTemplates; i++)


@@ -1238,7 +1254,7 @@ wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
         if (templates[i]->IsVisible())
         {
             strings[n] = WXSTRINGCAST templates[i]->m_description;
         if (templates[i]->IsVisible())
         {
             strings[n] = WXSTRINGCAST templates[i]->m_description;

-            data[n] = (char *)templates[i];
+            data[n] = (wxChar *)templates[i];

             n ++;
         }
     }
             n ++;
         }
     }


@@ -1266,16 +1282,16 @@ wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
 wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates,
         int noTemplates)
 {
 wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates,
         int noTemplates)
 {

-    char **strings = new char *[noTemplates];
-    char **data = new char *[noTemplates];
+    wxChar **strings = new wxChar *[noTemplates];
+    wxChar **data = new wxChar *[noTemplates];

     int i;
     int n = 0;
     for (i = 0; i < noTemplates; i++)
     {
     int 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;
         {
             strings[n] = WXSTRINGCAST templates[i]->m_viewTypeName;

-            data[n] = (char *)templates[i];
+            data[n] = (wxChar *)templates[i];

             n ++;
         }
     }
             n ++;
         }
     }


@@ -1446,7 +1462,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);
 }
 


@@ -1655,14 +1671,14 @@ bool wxCommandProcessor::Redo()
     return FALSE;
 }
 
     return FALSE;
 }
 

-bool wxCommandProcessor::CanUndo(void) const
+bool wxCommandProcessor::CanUndo() const

 {
     if (m_currentCommand)
         return ((wxCommand *)m_currentCommand->Data())->CanUndo();
     return FALSE;
 }
 
 {
     if (m_currentCommand)
         return ((wxCommand *)m_currentCommand->Data())->CanUndo();
     return FALSE;
 }
 

-bool wxCommandProcessor::CanRedo(void) const
+bool wxCommandProcessor::CanRedo() const

 {
     if ((m_currentCommand != (wxNode*) NULL) && (m_currentCommand->Next() == (wxNode*) NULL))
         return FALSE;
 {
     if ((m_currentCommand != (wxNode*) NULL) && (m_currentCommand->Next() == (wxNode*) NULL))
         return FALSE;


@@ -1691,7 +1707,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;


@@ -1706,7 +1722,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);


@@ -1733,7 +1749,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);


@@ -1763,7 +1779,7 @@ wxFileHistory::wxFileHistory(int maxFiles)
 {
     m_fileMaxFiles = maxFiles;
     m_fileHistoryN = 0;
 {
     m_fileMaxFiles = maxFiles;
     m_fileHistoryN = 0;

-    m_fileHistory = new char *[m_fileMaxFiles];
+    m_fileHistory = new wxChar *[m_fileMaxFiles];

 }
 
 wxFileHistory::~wxFileHistory()
 }
 
 wxFileHistory::~wxFileHistory()


@@ -1792,7 +1808,7 @@ void wxFileHistory::AddFileToHistory(const wxString& file)
     if (m_fileHistoryN == m_fileMaxFiles)
     {
         delete[] m_fileHistory[m_fileMaxFiles-1];
     if (m_fileHistoryN == m_fileMaxFiles)
     {
         delete[] m_fileHistory[m_fileMaxFiles-1];

-        m_fileHistory[m_fileMaxFiles-1] = (char *) NULL;
+        m_fileHistory[m_fileMaxFiles-1] = (wxChar *) NULL;

     }
     if (m_fileHistoryN < m_fileMaxFiles)
     {
     }
     if (m_fileHistoryN < m_fileMaxFiles)
     {


@@ -1818,7 +1834,7 @@ void wxFileHistory::AddFileToHistory(const wxString& file)
         if (m_fileHistory[i])
         {
             wxString buf;
         if (m_fileHistory[i])
         {
             wxString buf;

-            buf.Printf("&%d %s", i+1, m_fileHistory[i]);
+            buf.Printf(_T("&%d %s"), i+1, m_fileHistory[i]);

             wxNode* node = m_fileMenus.First();
             while (node)
             {
             wxNode* node = m_fileMenus.First();
             while (node)
             {


@@ -1853,13 +1869,13 @@ void wxFileHistory::Load(wxConfigBase& config)
 {
     m_fileHistoryN = 0;
     wxString buf;
 {
     m_fileHistoryN = 0;
     wxString buf;

-    buf.Printf("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 char*) historyFile);
+        m_fileHistory[m_fileHistoryN] = copystring((const wxChar*) historyFile);

         m_fileHistoryN ++;
         m_fileHistoryN ++;

-        buf.Printf("file%d", m_fileHistoryN+1);
+        buf.Printf(_T("file%d"), m_fileHistoryN+1);

         historyFile = "";
     }
     AddFilesToMenu();
         historyFile = "";
     }
     AddFilesToMenu();


@@ -1871,7 +1887,7 @@ void wxFileHistory::Save(wxConfigBase& config)
     for (i = 0; i < m_fileHistoryN; i++)
     {
         wxString buf;
     for (i = 0; i < m_fileHistoryN; i++)
     {
         wxString buf;

-        buf.Printf("file%d", i+1);
+        buf.Printf(_T("file%d"), i+1);

         config.Write(buf, wxString(m_fileHistory[i]));
     }
 }
         config.Write(buf, wxString(m_fileHistory[i]));
     }
 }


@@ -1892,7 +1908,7 @@ void wxFileHistory::AddFilesToMenu()
                 if (m_fileHistory[i])
                 {
                     wxString buf;
                 if (m_fileHistory[i])
                 {
                     wxString buf;

-                    buf.Printf("&%d %s", i+1, m_fileHistory[i]);
+                    buf.Printf(_T("&%d %s"), i+1, m_fileHistory[i]);

                     menu->Append(wxID_FILE1+i, buf);
                 }
             }
                     menu->Append(wxID_FILE1+i, buf);
                 }
             }


@@ -1912,7 +1928,7 @@ void wxFileHistory::AddFilesToMenu(wxMenu* menu)
             if (m_fileHistory[i])
             {
                 wxString buf;
             if (m_fileHistory[i])
             {
                 wxString buf;

-                buf.Printf("&%d %s", i+1, m_fileHistory[i]);
+                buf.Printf(_T("&%d %s"), i+1, m_fileHistory[i]);

                 menu->Append(wxID_FILE1+i, buf);
             }
         }
                 menu->Append(wxID_FILE1+i, buf);
             }
         }


@@ -1929,7 +1945,7 @@ bool wxTransferFileToStream(const wxString& filename, ostream& stream)
     FILE *fd1;
     int ch;
 
     FILE *fd1;
     int ch;
 

-    if ((fd1 = fopen (WXSTRINGCAST filename, "rb")) == NULL)
+    if ((fd1 = fopen (filename.fn_str(), "rb")) == NULL)

         return FALSE;
 
     while ((ch = getc (fd1)) != EOF)
         return FALSE;
 
     while ((ch = getc (fd1)) != EOF)


@@ -1944,7 +1960,7 @@ bool wxTransferStreamToFile(istream& stream, const wxString& filename)
     FILE *fd1;
     int ch;
 
     FILE *fd1;
     int ch;
 

-    if ((fd1 = fopen (WXSTRINGCAST filename, "wb")) == NULL)
+    if ((fd1 = fopen (filename.fn_str(), "wb")) == NULL)

     {
         return FALSE;
     }
     {
         return FALSE;
     }