X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0fb67cd1968707f15341792406da62045e11c5f0..48da7d0ba891d2e6d2f326a5122b92bae2fdf1fc:/src/common/docview.cpp diff --git a/src/common/docview.cpp b/src/common/docview.cpp index deb4271735..2ea1501dda 100644 --- 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 + #include "wx/intl.h" #endif #ifdef __WXGTK__ @@ -92,7 +92,7 @@ // function prototypes // ---------------------------------------------------------------------------- -static inline wxString FindExtension(const char *path); +static inline wxString FindExtension(const wxChar *path); // ============================================================================ // implementation @@ -102,7 +102,7 @@ static inline wxString FindExtension(const char *path); // local functions // ---------------------------------------------------------------------------- -static wxString FindExtension(const char *path) +static wxString FindExtension(const wxChar *path) { wxString ext; wxSplitPath(path, NULL, NULL, &ext); @@ -178,14 +178,14 @@ bool wxDocument::DeleteAllViews() 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(); } -wxDocManager *wxDocument::GetDocumentManager(void) const +wxDocManager *wxDocument::GetDocumentManager() const { return m_documentTemplate->GetDocumentManager(); } @@ -213,7 +213,7 @@ bool wxDocument::Save() 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); @@ -245,7 +245,7 @@ bool wxDocument::SaveAs() wxString ext(""); wxSplitPath(fileName, & path, & name, & ext); - if (ext.IsEmpty() || ext == "") + if (ext.IsEmpty() || ext == _T("")) { fileName += "."; fileName += docTemplate->GetDefaultExtension(); @@ -274,12 +274,12 @@ bool wxDocument::OnSaveDocument(const wxString& file) return FALSE; wxString msgTitle; - if (wxTheApp->GetAppName() != "") + if (wxTheApp->GetAppName() != _T("")) 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, @@ -305,12 +305,12 @@ bool wxDocument::OnOpenDocument(const wxString& file) return FALSE; wxString msgTitle; - if (wxTheApp->GetAppName() != "") + if (wxTheApp->GetAppName() != _T("")) 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, @@ -355,12 +355,12 @@ bool wxDocument::Revert() // 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; } - else if (m_documentFile != "") + else if (m_documentFile != _T("")) { buf = wxFileNameFromPath(m_documentFile); return TRUE; @@ -372,7 +372,7 @@ bool wxDocument::GetPrintableName(wxString& buf) const } } -wxWindow *wxDocument::GetDocumentWindow(void) const +wxWindow *wxDocument::GetDocumentWindow() const { wxView *view = GetFirstView(); if (view) @@ -395,14 +395,14 @@ bool wxDocument::OnSaveModified() 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?"), - (const char *)title); + (const wxChar *)title); int res = wxMessageBox(prompt, msgTitle, wxYES_NO|wxCANCEL|wxICON_QUESTION, GetDocumentWindow()); @@ -576,7 +576,7 @@ wxPrintout *wxView::OnCreatePrintout() { return new wxDocPrintout(this); } -#endif +#endif // wxUSE_PRINTING_ARCHITECTURE // ---------------------------------------------------------------------------- // wxDocTemplate @@ -594,7 +594,6 @@ wxDocTemplate::wxDocTemplate(wxDocManager *manager, long flags) { m_documentManager = manager; - m_flags = flags; m_description = descr; m_directory = dir; m_defaultExt = ext; @@ -650,6 +649,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 // ---------------------------------------------------------------------------- @@ -848,7 +854,7 @@ void wxDocManager::OnRedo(wxCommandEvent& WXUNUSED(event)) doc->GetCommandProcessor()->Redo(); } -wxView *wxDocManager::GetCurrentView(void) const +wxView *wxDocManager::GetCurrentView() const { if (m_currentView) return m_currentView; @@ -948,8 +954,8 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags) // Existing document wxDocTemplate *temp = (wxDocTemplate *) NULL; - wxString path2(""); - if (path != "") + wxString path2(_T("")); + if (path != _T("")) path2 = path; if (flags & wxDOC_SILENT) @@ -1035,7 +1041,7 @@ bool wxDocManager::FlushDoc(wxDocument *WXUNUSED(doc)) return FALSE; } -wxDocument *wxDocManager::GetCurrentDocument(void) const +wxDocument *wxDocManager::GetCurrentDocument() const { if (m_currentView) return m_currentView->GetDocument(); @@ -1113,7 +1119,7 @@ void wxDocManager::FileHistoryAddFilesToMenu() m_fileHistory->AddFilesToMenu(); } -int wxDocManager::GetNoHistoryFiles(void) const +int wxDocManager::GetNoHistoryFiles() const { if (m_fileHistory) return m_fileHistory->GetNoHistoryFiles(); @@ -1122,24 +1128,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) { - wxString theExt = FindExtension(path); - if (!theExt) - return (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(); - if (strcmp(temp->GetDefaultExtension(), theExt) == 0) + if ( temp->FileMatchesTemplate(path) ) { theTemplate = temp; break; @@ -1154,7 +1154,11 @@ wxDocTemplate *wxDocManager::FindTemplateForPath(const wxString& path) // template extension. wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates, +#ifdef __WXMSW__ int noTemplates, +#else + int WXUNUSED(noTemplates), +#endif wxString& path, long WXUNUSED(flags), bool WXUNUSED(save)) @@ -1170,19 +1174,25 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates, { // add a '|' to separate this filter from the previous one if ( !descrBuf.IsEmpty() ) - descrBuf << '|'; + descrBuf << _T('|'); descrBuf << templates[i]->GetDescription() - << " (" << templates[i]->GetFileFilter() << ") |" + << _T(" (") << templates[i]->GetFileFilter() << _T(") |") << templates[i]->GetFileFilter(); } } #else - wxString descrBuf = "*.*"; + wxString descrBuf = _T("*.*"); #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()) { @@ -1196,11 +1206,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); + if ( !theTemplate ) + theTemplate = templates[FilterIndex]; + return theTemplate; } else { - path = ""; + path = _T(""); return (wxDocTemplate *) NULL; } #if 0 @@ -1211,7 +1224,7 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates, 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()); @@ -1229,8 +1242,8 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates, 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++) @@ -1238,7 +1251,7 @@ wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates, if (templates[i]->IsVisible()) { strings[n] = WXSTRINGCAST templates[i]->m_description; - data[n] = (char *)templates[i]; + data[n] = (wxChar *)templates[i]; n ++; } } @@ -1266,16 +1279,16 @@ wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates, 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++) { - if (templates[i]->IsVisible() && (templates[i]->GetViewName() != "")) + if (templates[i]->IsVisible() && (templates[i]->GetViewName() != _T(""))) { strings[n] = WXSTRINGCAST templates[i]->m_viewTypeName; - data[n] = (char *)templates[i]; + data[n] = (wxChar *)templates[i]; n ++; } } @@ -1446,7 +1459,7 @@ void wxDocParentFrame::OnExit(wxCommandEvent& WXUNUSED(event)) 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); } @@ -1655,14 +1668,14 @@ bool wxCommandProcessor::Redo() return FALSE; } -bool wxCommandProcessor::CanUndo(void) const +bool wxCommandProcessor::CanUndo() const { 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; @@ -1691,7 +1704,7 @@ void wxCommandProcessor::SetMenuStrings() { 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; @@ -1706,7 +1719,7 @@ void wxCommandProcessor::SetMenuStrings() { 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); @@ -1733,7 +1746,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()); - 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); @@ -1763,7 +1776,7 @@ wxFileHistory::wxFileHistory(int maxFiles) { m_fileMaxFiles = maxFiles; m_fileHistoryN = 0; - m_fileHistory = new char *[m_fileMaxFiles]; + m_fileHistory = new wxChar *[m_fileMaxFiles]; } wxFileHistory::~wxFileHistory() @@ -1792,7 +1805,7 @@ void wxFileHistory::AddFileToHistory(const wxString& file) 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) { @@ -1818,7 +1831,7 @@ void wxFileHistory::AddFileToHistory(const wxString& file) 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) { @@ -1853,13 +1866,13 @@ void wxFileHistory::Load(wxConfigBase& config) { m_fileHistoryN = 0; wxString buf; - buf.Printf("file%d", m_fileHistoryN+1); + 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 char*) historyFile); + m_fileHistory[m_fileHistoryN] = copystring((const wxChar*) historyFile); m_fileHistoryN ++; - buf.Printf("file%d", m_fileHistoryN+1); + buf.Printf(_T("file%d"), m_fileHistoryN+1); historyFile = ""; } AddFilesToMenu(); @@ -1871,7 +1884,7 @@ void wxFileHistory::Save(wxConfigBase& config) 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])); } } @@ -1892,7 +1905,7 @@ void wxFileHistory::AddFilesToMenu() 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); } } @@ -1912,7 +1925,7 @@ void wxFileHistory::AddFilesToMenu(wxMenu* menu) 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); } } @@ -1929,7 +1942,7 @@ bool wxTransferFileToStream(const wxString& filename, ostream& stream) 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) @@ -1944,7 +1957,7 @@ bool wxTransferStreamToFile(istream& stream, const wxString& filename) FILE *fd1; int ch; - if ((fd1 = fopen (WXSTRINGCAST filename, "wb")) == NULL) + if ((fd1 = fopen (filename.fn_str(), "wb")) == NULL) { return FALSE; }