X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0c5d3e1ccd1d27ab0cf913ddbffb1b54b5802f3a..312cd9e93d7c0bf201e52297741e8e12a7298fc9:/src/common/docview.cpp diff --git a/src/common/docview.cpp b/src/common/docview.cpp index b0e3db14b2..5f8f896791 100644 --- a/src/common/docview.cpp +++ b/src/common/docview.cpp @@ -56,6 +56,7 @@ #include "wx/choicdlg.h" #include "wx/docview.h" #include "wx/confbase.h" +#include "wx/file.h" #include #include @@ -75,7 +76,6 @@ // wxWindows macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_ABSTRACT_CLASS(wxDocument, wxEvtHandler) IMPLEMENT_ABSTRACT_CLASS(wxView, wxEvtHandler) IMPLEMENT_ABSTRACT_CLASS(wxDocTemplate, wxObject) @@ -90,7 +90,6 @@ IMPLEMENT_CLASS(wxCommand, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxCommandProcessor, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxFileHistory, wxObject) -#endif // ---------------------------------------------------------------------------- // function prototypes @@ -102,7 +101,7 @@ static inline wxString FindExtension(const wxChar *path); // local constants // ---------------------------------------------------------------------------- -static const char *s_MRUEntryFormat = _T("&%d %s"); +static const wxChar *s_MRUEntryFormat = wxT("&%d %s"); // ============================================================================ // implementation @@ -223,7 +222,7 @@ bool wxDocument::Save() bool ret = FALSE; if (!IsModified()) return TRUE; - if (m_documentFile == _T("") || !m_savedYet) + if (m_documentFile == wxT("") || !m_savedYet) ret = SaveAs(); else ret = OnSaveDocument(m_documentFile); @@ -253,7 +252,7 @@ bool wxDocument::SaveAs() wxString path, name, ext; wxSplitPath(fileName, & path, & name, & ext); - if (ext.IsEmpty() || ext == _T("")) + if (ext.IsEmpty() || ext == wxT("")) { fileName += "."; fileName += docTemplate->GetDefaultExtension(); @@ -282,7 +281,7 @@ bool wxDocument::OnSaveDocument(const wxString& file) return FALSE; wxString msgTitle; - if (wxTheApp->GetAppName() != _T("")) + if (wxTheApp->GetAppName() != wxT("")) msgTitle = wxTheApp->GetAppName(); else msgTitle = wxString(_("File error")); @@ -292,7 +291,7 @@ bool wxDocument::OnSaveDocument(const wxString& file) if (store.fail() || store.bad()) #else wxFileOutputStream store(wxString(file.fn_str())); - if (store.LastError() != 0) + if (store.LastError() != wxSTREAM_NOERROR) #endif { (void)wxMessageBox(_("Sorry, could not open this file for saving."), msgTitle, wxOK | wxICON_EXCLAMATION, @@ -318,7 +317,7 @@ bool wxDocument::OnOpenDocument(const wxString& file) return FALSE; wxString msgTitle; - if (wxTheApp->GetAppName() != _T("")) + if (wxTheApp->GetAppName() != wxT("")) msgTitle = wxTheApp->GetAppName(); else msgTitle = wxString(_("File error")); @@ -328,14 +327,20 @@ bool wxDocument::OnOpenDocument(const wxString& file) if (store.fail() || store.bad()) #else wxFileInputStream store(wxString(file.fn_str())); - if (store.LastError() != 0) + if (store.LastError() != wxSTREAM_NOERROR) #endif { (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK|wxICON_EXCLAMATION, GetDocumentWindow()); return FALSE; } +#if wxUSE_STD_IOSTREAM if (!LoadObject(store)) +#else + int res = LoadObject(store).LastError(); + if ((res != wxSTREAM_NOERROR) && + (res != wxSTREAM_EOF)) +#endif { (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK|wxICON_EXCLAMATION, GetDocumentWindow()); @@ -377,12 +382,12 @@ bool wxDocument::Revert() // Get title, or filename if no title, else unnamed bool wxDocument::GetPrintableName(wxString& buf) const { - if (m_documentTitle != _T("")) + if (m_documentTitle != wxT("")) { buf = m_documentTitle; return TRUE; } - else if (m_documentFile != _T("")) + else if (m_documentFile != wxT("")) { buf = wxFileNameFromPath(m_documentFile); return TRUE; @@ -417,7 +422,7 @@ bool wxDocument::OnSaveModified() GetPrintableName(title); wxString msgTitle; - if (wxTheApp->GetAppName() != _T("")) + if (wxTheApp->GetAppName() != wxT("")) msgTitle = wxTheApp->GetAppName(); else msgTitle = wxString(_("Warning")); @@ -521,13 +526,13 @@ wxView::wxView() // SetDocument(doc); m_viewDocument = (wxDocument*) NULL; - m_viewTypeName = ""; + m_viewTypeName = wxT(""); m_viewFrame = (wxFrame *) NULL; } wxView::~wxView() { - GetDocumentManager()->ActivateView(this, FALSE, TRUE); +// GetDocumentManager()->ActivateView(this, FALSE, TRUE); m_viewDocument->RemoveView(this); } @@ -984,8 +989,8 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags) // Existing document wxDocTemplate *temp = (wxDocTemplate *) NULL; - wxString path2(_T("")); - if (path != _T("")) + wxString path2(wxT("")); + if (path != wxT("")) path2 = path; if (flags & wxDOC_SILENT) @@ -1190,7 +1195,7 @@ wxDocTemplate *wxDocManager::FindTemplateForPath(const wxString& path) // template extension. wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates, -#ifdef __WXMSW__ +#if defined(__WXMSW__) || defined(__WXGTK__) int noTemplates, #else int WXUNUSED(noTemplates), @@ -1199,8 +1204,8 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates, long WXUNUSED(flags), bool WXUNUSED(save)) { - // We can only have multiple filters in Windows -#ifdef __WXMSW__ + // We can only have multiple filters in Windows and GTK +#if defined(__WXMSW__) || defined(__WXGTK__) wxString descrBuf; int i; @@ -1210,21 +1215,21 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates, { // add a '|' to separate this filter from the previous one if ( !descrBuf.IsEmpty() ) - descrBuf << _T('|'); + descrBuf << wxT('|'); descrBuf << templates[i]->GetDescription() - << _T(" (") << templates[i]->GetFileFilter() << _T(") |") + << wxT(" (") << templates[i]->GetFileFilter() << wxT(") |") << templates[i]->GetFileFilter(); } } #else - wxString descrBuf = _T("*.*"); + wxString descrBuf = wxT("*.*"); #endif int FilterIndex = 0; wxString pathTmp = wxFileSelectorEx(_("Select a file"), - _T(""), - _T(""), + m_lastDirectory, + wxT(""), &FilterIndex, descrBuf, 0, @@ -1232,6 +1237,8 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates, if (!pathTmp.IsEmpty()) { + m_lastDirectory = wxPathOnly(pathTmp); + path = pathTmp; wxString theExt = FindExtension(path); if (!theExt) @@ -1249,7 +1256,7 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates, } else { - path = _T(""); + path = wxT(""); return (wxDocTemplate *) NULL; } #if 0 @@ -1260,7 +1267,7 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates, if (!temp) return (wxDocTemplate *) NULL; - wxChar *pathTmp = wxFileSelector(_("Select a file"), _T(""), _T(""), + wxChar *pathTmp = wxFileSelector(_("Select a file"), wxT(""), wxT(""), temp->GetDefaultExtension(), temp->GetFileFilter(), 0, wxTheApp->GetTopWindow()); @@ -1286,7 +1293,7 @@ wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates, { if (templates[i]->IsVisible()) { - strings[n] = WXSTRINGCAST templates[i]->m_description; + strings[n] = (wxChar *)templates[i]->m_description.c_str(); data[n] = (wxChar *)templates[i]; n ++; } @@ -1306,7 +1313,7 @@ wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates, } wxDocTemplate *theTemplate = (wxDocTemplate *)wxGetSingleChoiceData(_("Select a document template"), _("Templates"), n, - strings, (char **)data); + strings, (void **)data); delete[] strings; delete[] data; return theTemplate; @@ -1321,15 +1328,15 @@ wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates, int n = 0; for (i = 0; i < noTemplates; i++) { - if (templates[i]->IsVisible() && (templates[i]->GetViewName() != _T(""))) + if (templates[i]->IsVisible() && (templates[i]->GetViewName() != wxT(""))) { - strings[n] = WXSTRINGCAST templates[i]->m_viewTypeName; + strings[n] = (wxChar *)templates[i]->m_viewTypeName.c_str(); data[n] = (wxChar *)templates[i]; n ++; } } wxDocTemplate *theTemplate = (wxDocTemplate *)wxGetSingleChoiceData(_("Select a document view"), _("Views"), n, - strings, (char **)data); + strings, (void **)data); delete[] strings; delete[] data; return theTemplate; @@ -1542,7 +1549,7 @@ void wxDocParentFrame::OnCloseWindow(wxCloseEvent& event) #if wxUSE_PRINTING_ARCHITECTURE wxDocPrintout::wxDocPrintout(wxView *view, const wxString& title) - : wxPrintout(WXSTRINGCAST title) + : wxPrintout(title) { m_printoutView = view; } @@ -1758,7 +1765,7 @@ void wxCommandProcessor::SetMenuStrings() { wxCommand *command = (wxCommand *)m_currentCommand->Data(); wxString commandName(command->GetName()); - if (commandName == _T("")) commandName = _("Unnamed command"); + if (commandName == wxT("")) commandName = _("Unnamed command"); bool canUndo = command->CanUndo(); if (canUndo) buf = wxString(_("&Undo ")) + commandName; @@ -1773,7 +1780,7 @@ void wxCommandProcessor::SetMenuStrings() { wxCommand *redoCommand = (wxCommand *)m_currentCommand->Next()->Data(); wxString redoCommandName(redoCommand->GetName()); - if (redoCommandName == _T("")) redoCommandName = _("Unnamed command"); + if (redoCommandName == wxT("")) redoCommandName = _("Unnamed command"); buf = wxString(_("&Redo ")) + redoCommandName; m_commandEditMenu->SetLabel(wxID_REDO, buf); m_commandEditMenu->Enable(wxID_REDO, TRUE); @@ -1800,7 +1807,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 == _T("")) redoCommandName = _("Unnamed command"); + if (redoCommandName == wxT("")) redoCommandName = _("Unnamed command"); buf = wxString(_("&Redo ")) + redoCommandName; m_commandEditMenu->SetLabel(wxID_REDO, buf); m_commandEditMenu->Enable(wxID_REDO, TRUE); @@ -1899,19 +1906,13 @@ void wxFileHistory::AddFileToHistory(const wxString& file) void wxFileHistory::RemoveFileFromHistory(int i) { wxCHECK_RET( i < m_fileHistoryN, - _T("invalid index in wxFileHistory::RemoveFileFromHistory") ); + wxT("invalid index in wxFileHistory::RemoveFileFromHistory") ); wxNode* node = m_fileMenus.First(); while ( node ) { wxMenu* menu = (wxMenu*) node->Data(); - // wxMenu::Delete() is missing from wxGTK, so this can't be done :-( -#if 0 - // delete the menu items - menu->Delete(wxID_FILE1 + i); -#endif - // delete the element from the array (could use memmove() too...) delete [] m_fileHistory[i]; @@ -1929,22 +1930,44 @@ void wxFileHistory::RemoveFileFromHistory(int i) menu->SetLabel(wxID_FILE1 + j, buf); } - // to be removed as soon as wxMenu::Delete() is implemented -#if 1 - menu->SetLabel(wxID_FILE1 + m_fileHistoryN - 1, _T("")); -#endif - node = node->Next(); + + // delete the last menu item which is unused now + menu->Delete(wxID_FILE1 + m_fileHistoryN - 1); + + // delete the last separator too if no more files are left + if ( m_fileHistoryN == 1 ) + { + wxMenuItemList::Node *node = menu->GetMenuItems().GetLast(); + if ( node ) + { + wxMenuItem *menuItem = node->GetData(); + if ( menuItem->IsSeparator() ) + { + menu->Delete(menuItem); + } + //else: should we search backwards for the last separator? + } + //else: menu is empty somehow + } } + m_fileHistoryN--; } wxString wxFileHistory::GetHistoryFile(int i) const { - if (i < m_fileHistoryN) - return wxString(m_fileHistory[i]); + wxString s; + if ( i < m_fileHistoryN ) + { + s = m_fileHistory[i]; + } else - return wxString(""); + { + wxFAIL_MSG( wxT("bad index in wxFileHistory::GetHistoryFile") ); + } + + return s; } void wxFileHistory::UseMenu(wxMenu *menu) @@ -1963,14 +1986,14 @@ void wxFileHistory::Load(wxConfigBase& config) { m_fileHistoryN = 0; wxString buf; - buf.Printf(_T("file%d"), m_fileHistoryN+1); + buf.Printf(wxT("file%d"), m_fileHistoryN+1); wxString historyFile; - while ((m_fileHistoryN <= m_fileMaxFiles) && config.Read(buf, &historyFile) && (historyFile != _T(""))) + while ((m_fileHistoryN <= m_fileMaxFiles) && config.Read(buf, &historyFile) && (historyFile != wxT(""))) { m_fileHistory[m_fileHistoryN] = copystring((const wxChar*) historyFile); m_fileHistoryN ++; - buf.Printf(_T("file%d"), m_fileHistoryN+1); - historyFile = ""; + buf.Printf(wxT("file%d"), m_fileHistoryN+1); + historyFile = wxT(""); } AddFilesToMenu(); } @@ -1981,7 +2004,7 @@ void wxFileHistory::Save(wxConfigBase& config) for (i = 0; i < m_fileHistoryN; i++) { wxString buf; - buf.Printf(_T("file%d"), i+1); + buf.Printf(wxT("file%d"), i+1); config.Write(buf, wxString(m_fileHistory[i])); } }