// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
-// Copyright: (c) Julian Smart and Markus Holzem
+// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "docview.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
- #pragma hdrstop
+ #pragma hdrstop
#endif
#if wxUSE_DOC_VIEW_ARCHITECTURE
+#include "wx/docview.h"
+
#ifndef WX_PRECOMP
+ #include "wx/list.h"
#include "wx/string.h"
#include "wx/utils.h"
#include "wx/app.h"
#include "wx/dc.h"
#include "wx/dialog.h"
#include "wx/menu.h"
- #include "wx/list.h"
#include "wx/filedlg.h"
#include "wx/intl.h"
#include "wx/log.h"
+ #include "wx/msgdlg.h"
+ #include "wx/mdi.h"
+ #include "wx/choicdlg.h"
#endif
#include "wx/ffile.h"
#include "wx/filename.h"
#endif
-#ifdef __WXGTK__
- #include "wx/mdi.h"
-#endif
-
#if wxUSE_PRINTING_ARCHITECTURE
- #include "wx/prntbase.h"
- #include "wx/printdlg.h"
+ #include "wx/prntbase.h"
+ #include "wx/printdlg.h"
#endif
-#include "wx/msgdlg.h"
-#include "wx/choicdlg.h"
-#include "wx/docview.h"
#include "wx/confbase.h"
#include "wx/file.h"
#include "wx/cmdproc.h"
+#include "wx/tokenzr.h"
#include <stdio.h>
#include <string.h>
#if wxUSE_STD_IOSTREAM
- #include "wx/ioswrap.h"
- #if wxUSE_IOSTREAMH
- #include <fstream.h>
- #else
- #include <fstream>
- #endif
+ #include "wx/ioswrap.h"
+ #if wxUSE_IOSTREAMH
+ #include <fstream.h>
+ #else
+ #include <fstream>
+ #endif
#else
- #include "wx/wfstream.h"
+ #include "wx/wfstream.h"
#endif
// ----------------------------------------------------------------------------
-// wxWindows macros
+// wxWidgets macros
// ----------------------------------------------------------------------------
IMPLEMENT_ABSTRACT_CLASS(wxDocument, wxEvtHandler)
// ----------------------------------------------------------------------------
static inline wxString FindExtension(const wxChar *path);
+static wxWindow* wxFindSuitableParent(void);
// ----------------------------------------------------------------------------
// local constants
wxDocument::wxDocument(wxDocument *parent)
{
- m_documentModified = FALSE;
+ m_documentModified = false;
m_documentParent = parent;
m_documentTemplate = (wxDocTemplate *) NULL;
m_commandProcessor = (wxCommandProcessor*) NULL;
- m_savedYet = FALSE;
+ m_savedYet = false;
}
bool wxDocument::DeleteContents()
{
- return TRUE;
+ return true;
}
wxDocument::~wxDocument()
if (OnSaveModified())
return OnCloseDocument();
else
- return FALSE;
+ return false;
}
bool wxDocument::OnCloseDocument()
{
// Tell all views that we're about to close
- NotifyClosing();
+ NotifyClosing();
DeleteContents();
- Modify(FALSE);
- return TRUE;
+ Modify(false);
+ return true;
}
// Note that this implicitly deletes the document when the last view is
{
wxDocManager* manager = GetDocumentManager();
- wxNode *node = m_documentViews.GetFirst();
- while (node)
+ // first check if all views agree to be closed
+ const wxList::iterator end = m_documentViews.end();
+ for ( wxList::iterator i = m_documentViews.begin(); i != end; ++i )
{
- wxView *view = (wxView *)node->GetData();
- if (!view->Close())
- return FALSE;
+ wxView *view = (wxView *)*i;
+ if ( !view->Close() )
+ return false;
+ }
+
+ // all views agreed to close, now do close them
+ if ( m_documentViews.empty() )
+ {
+ // normally the document would be implicitly deleted when the last view
+ // is, but if don't have any views, do it here instead
+ if ( manager && manager->GetDocuments().Member(this) )
+ delete this;
+ }
+ else // have views
+ {
+ // as we delete elements we iterate over, don't use the usual "from
+ // begin to end" loop
+ for ( ;; )
+ {
+ wxView *view = (wxView *)*m_documentViews.begin();
- wxNode *next = node->GetNext();
+ bool isLastOne = m_documentViews.size() == 1;
- delete view; // Deletes node implicitly
- node = next;
+ // this always deletes the node implicitly and if this is the last
+ // view also deletes this object itself (also implicitly, great),
+ // so we can't test for m_documentViews.empty() after calling this!
+ delete view;
+
+ if ( isLastOne )
+ break;
+ }
}
- // If we haven't yet deleted the document (for example
- // if there were no views) then delete it.
- if (manager && manager->GetDocuments().Member(this))
- delete this;
- return TRUE;
+ return true;
}
wxView *wxDocument::GetFirstView() const
bool wxDocument::OnNewDocument()
{
if (!OnSaveModified())
- return FALSE;
+ return false;
- if (OnCloseDocument()==FALSE) return FALSE;
+ if (OnCloseDocument()==false) return false;
DeleteContents();
- Modify(FALSE);
- SetDocumentSaved(FALSE);
+ Modify(false);
+ SetDocumentSaved(false);
wxString name;
GetDocumentManager()->MakeDefaultName(name);
SetTitle(name);
- SetFilename(name, TRUE);
+ SetFilename(name, true);
- return TRUE;
+ return true;
}
bool wxDocument::Save()
{
if (!IsModified() && m_savedYet)
- return TRUE;
+ return true;
if ( m_documentFile.empty() || !m_savedYet )
return SaveAs();
{
wxDocTemplate *docTemplate = GetDocumentTemplate();
if (!docTemplate)
- return FALSE;
+ return false;
+
+#if defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXMAC__)
+ wxString filter = docTemplate->GetDescription() + wxT(" (") + docTemplate->GetFileFilter() + wxT(")|") + docTemplate->GetFileFilter();
+
+ // Now see if there are some other template with identical view and document
+ // classes, whose filters may also be used.
+
+ if (docTemplate->GetViewClassInfo() && docTemplate->GetDocClassInfo())
+ {
+ wxList::compatibility_iterator node = wxDocManager::GetDocumentManager()->GetTemplates().GetFirst();
+ while (node)
+ {
+ wxDocTemplate *t = (wxDocTemplate*) node->GetData();
+
+ if (t->IsVisible() && t != docTemplate &&
+ t->GetViewClassInfo() == docTemplate->GetViewClassInfo() &&
+ t->GetDocClassInfo() == docTemplate->GetDocClassInfo())
+ {
+ // add a '|' to separate this filter from the previous one
+ if ( !filter.empty() )
+ filter << wxT('|');
+
+ filter << t->GetDescription() << wxT(" (") << t->GetFileFilter() << wxT(") |")
+ << t->GetFileFilter();
+ }
+ node = node->GetNext();
+ }
+ }
+#else
+ wxString filter = docTemplate->GetFileFilter() ;
+#endif
wxString tmp = wxFileSelector(_("Save as"),
docTemplate->GetDirectory(),
wxFileNameFromPath(GetFilename()),
docTemplate->GetDefaultExtension(),
- docTemplate->GetFileFilter(),
- wxSAVE | wxOVERWRITE_PROMPT,
+ filter,
+ wxFD_SAVE | wxFD_OVERWRITE_PROMPT,
GetDocumentWindow());
- if (tmp.IsEmpty())
- return FALSE;
+ if (tmp.empty())
+ return false;
wxString fileName(tmp);
wxString path, name, ext;
wxSplitPath(fileName, & path, & name, & ext);
- if (ext.IsEmpty() || ext == wxT(""))
+ if (ext.empty())
{
fileName += wxT(".");
fileName += docTemplate->GetDefaultExtension();
SetFilename(fileName);
SetTitle(wxFileNameFromPath(fileName));
- GetDocumentManager()->AddFileToHistory(fileName);
-
// Notify the views that the filename has changed
- wxNode *node = m_documentViews.GetFirst();
+ wxList::compatibility_iterator node = m_documentViews.GetFirst();
while (node)
{
wxView *view = (wxView *)node->GetData();
node = node->GetNext();
}
- return OnSaveDocument(m_documentFile);
+ // Files that were not saved correctly are not added to the FileHistory.
+ if (!OnSaveDocument(m_documentFile))
+ return false;
+
+ // A file that doesn't use the default extension of its document template cannot be opened
+ // via the FileHistory, so we do not add it.
+ if (docTemplate->FileMatchesTemplate(fileName))
+ {
+ GetDocumentManager()->AddFileToHistory(fileName);
+ }
+ else
+ {
+ // The user will probably not be able to open the file again, so
+ // we could warn about the wrong file-extension here.
+ }
+ return true;
}
bool wxDocument::OnSaveDocument(const wxString& file)
{
if ( !file )
- return FALSE;
+ return false;
- wxString msgTitle;
- if (wxTheApp->GetAppName() != wxT(""))
- msgTitle = wxTheApp->GetAppName();
- else
- msgTitle = wxString(_("File error"));
+ if ( !DoSaveDocument(file) )
+ return false;
-#if wxUSE_STD_IOSTREAM
- wxSTD ofstream store(file.mb_str());
- if (store.fail() || store.bad())
-#else
- wxFileOutputStream store(file);
- if (store.GetLastError() != wxSTREAM_NO_ERROR)
-#endif
- {
- (void)wxMessageBox(_("Sorry, could not open this file for saving."), msgTitle, wxOK | wxICON_EXCLAMATION,
- GetDocumentWindow());
- // Saving error
- return FALSE;
- }
- if (!SaveObject(store))
- {
- (void)wxMessageBox(_("Sorry, could not save this file."), msgTitle, wxOK | wxICON_EXCLAMATION,
- GetDocumentWindow());
- // Saving error
- return FALSE;
- }
- Modify(FALSE);
+ Modify(false);
SetFilename(file);
- SetDocumentSaved(TRUE);
+ SetDocumentSaved(true);
#ifdef __WXMAC__
wxFileName fn(file) ;
fn.MacSetDefaultTypeAndCreator() ;
#endif
- return TRUE;
+ return true;
}
bool wxDocument::OnOpenDocument(const wxString& file)
{
if (!OnSaveModified())
- return FALSE;
+ return false;
- wxString msgTitle;
- if (wxTheApp->GetAppName() != wxT(""))
- msgTitle = wxTheApp->GetAppName();
- else
- msgTitle = wxString(_("File error"));
+ if ( !DoOpenDocument(file) )
+ return false;
-#if wxUSE_STD_IOSTREAM
- wxSTD ifstream store(file.mb_str());
- if (store.fail() || store.bad())
-#else
- wxFileInputStream store(file);
- if (store.GetLastError() != wxSTREAM_NO_ERROR)
-#endif
- {
- (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK|wxICON_EXCLAMATION,
- GetDocumentWindow());
- return FALSE;
- }
-#if wxUSE_STD_IOSTREAM
- LoadObject(store);
- if ( !store && !store.eof() )
-#else
- int res = LoadObject(store).GetLastError();
- if ((res != wxSTREAM_NO_ERROR) &&
- (res != wxSTREAM_EOF))
-#endif
- {
- (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK|wxICON_EXCLAMATION,
- GetDocumentWindow());
- return FALSE;
- }
- SetFilename(file, TRUE);
- Modify(FALSE);
- m_savedYet = TRUE;
+ SetFilename(file, true);
+ Modify(false);
+ m_savedYet = true;
UpdateAllViews();
- return TRUE;
+ return true;
}
#if wxUSE_STD_IOSTREAM
bool wxDocument::Revert()
{
- return FALSE;
+ return false;
}
// Get title, or filename if no title, else unnamed
bool wxDocument::GetPrintableName(wxString& buf) const
{
- if (m_documentTitle != wxT(""))
+ if (!m_documentTitle.empty())
{
buf = m_documentTitle;
- return TRUE;
+ return true;
}
- else if (m_documentFile != wxT(""))
+ else if (!m_documentFile.empty())
{
buf = wxFileNameFromPath(m_documentFile);
- return TRUE;
+ return true;
}
else
{
buf = _("unnamed");
- return TRUE;
+ return true;
}
}
return new wxCommandProcessor;
}
-// TRUE if safe to close
+// true if safe to close
bool wxDocument::OnSaveModified()
{
if (IsModified())
GetPrintableName(title);
wxString msgTitle;
- if (wxTheApp->GetAppName() != wxT(""))
+ if (!wxTheApp->GetAppName().empty())
msgTitle = wxTheApp->GetAppName();
else
msgTitle = wxString(_("Warning"));
GetDocumentWindow());
if (res == wxNO)
{
- Modify(FALSE);
- return TRUE;
+ Modify(false);
+ return true;
}
else if (res == wxYES)
return Save();
else if (res == wxCANCEL)
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
bool wxDocument::Draw(wxDC& WXUNUSED(context))
{
- return TRUE;
+ return true;
}
bool wxDocument::AddView(wxView *view)
m_documentViews.Append(view);
OnChangedViewList();
}
- return TRUE;
+ return true;
}
bool wxDocument::RemoveView(wxView *view)
{
(void)m_documentViews.DeleteObject(view);
OnChangedViewList();
- return TRUE;
+ return true;
}
bool wxDocument::OnCreate(const wxString& WXUNUSED(path), long flags)
{
if (GetDocumentTemplate()->CreateView(this, flags))
- return TRUE;
+ return true;
else
- return FALSE;
+ return false;
}
// Called after a view is added or removed.
void wxDocument::UpdateAllViews(wxView *sender, wxObject *hint)
{
- wxNode *node = m_documentViews.GetFirst();
+ wxList::compatibility_iterator node = m_documentViews.GetFirst();
while (node)
{
wxView *view = (wxView *)node->GetData();
- if (view != sender)
+ if (view != sender)
view->OnUpdate(sender, hint);
node = node->GetNext();
}
void wxDocument::NotifyClosing()
{
- wxNode *node = m_documentViews.GetFirst();
+ wxList::compatibility_iterator node = m_documentViews.GetFirst();
while (node)
{
wxView *view = (wxView *)node->GetData();
if ( notifyViews )
{
// Notify the views that the filename has changed
- wxNode *node = m_documentViews.GetFirst();
+ wxList::compatibility_iterator node = m_documentViews.GetFirst();
while (node)
{
wxView *view = (wxView *)node->GetData();
}
}
+bool wxDocument::DoSaveDocument(const wxString& file)
+{
+ wxString msgTitle;
+ if (!wxTheApp->GetAppName().empty())
+ msgTitle = wxTheApp->GetAppName();
+ else
+ msgTitle = wxString(_("File error"));
+
+#if wxUSE_STD_IOSTREAM
+ wxSTD ofstream store(file.mb_str(), wxSTD ios::binary);
+ if (store.fail() || store.bad())
+#else
+ wxFileOutputStream store(file);
+ if (store.GetLastError() != wxSTREAM_NO_ERROR)
+#endif
+ {
+ (void)wxMessageBox(_("Sorry, could not open this file for saving."), msgTitle, wxOK | wxICON_EXCLAMATION,
+ GetDocumentWindow());
+ // Saving error
+ return false;
+ }
+ if (!SaveObject(store))
+ {
+ (void)wxMessageBox(_("Sorry, could not save this file."), msgTitle, wxOK | wxICON_EXCLAMATION,
+ GetDocumentWindow());
+ // Saving error
+ return false;
+ }
+
+ return true;
+}
+
+bool wxDocument::DoOpenDocument(const wxString& file)
+{
+#if wxUSE_STD_IOSTREAM
+ wxSTD ifstream store(file.mb_str(), wxSTD ios::binary);
+ if (!store.fail() && !store.bad())
+#else
+ wxFileInputStream store(file);
+ if (store.GetLastError() == wxSTREAM_NO_ERROR)
+#endif
+ {
+#if wxUSE_STD_IOSTREAM
+ LoadObject(store);
+ if ( !!store || store.eof() )
+#else
+ int res = LoadObject(store).GetLastError();
+ if ( res == wxSTREAM_NO_ERROR || res == wxSTREAM_EOF )
+#endif
+ return true;
+ }
+
+ wxLogError(_("Sorry, could not open this file."));
+ return false;
+}
+
+
// ----------------------------------------------------------------------------
// Document view
// ----------------------------------------------------------------------------
wxView::wxView()
{
- // SetDocument(doc);
m_viewDocument = (wxDocument*) NULL;
- m_viewTypeName = wxT("");
m_viewFrame = (wxFrame *) NULL;
}
wxView::~wxView()
{
-// GetDocumentManager()->ActivateView(this, FALSE, TRUE);
+ GetDocumentManager()->ActivateView(this, false);
m_viewDocument->RemoveView(this);
}
{
if ( !GetDocument() || !GetDocument()->ProcessEvent(event) )
return wxEvtHandler::ProcessEvent(event);
- else
- return TRUE;
+
+ return true;
}
void wxView::OnActivateView(bool WXUNUSED(activate), wxView *WXUNUSED(activeView), wxView *WXUNUSED(deactiveView))
void wxView::OnChangeFilename()
{
- if (GetFrame() && GetDocument())
- {
- wxString title;
+ // GetFrame can return wxWindow rather than wxTopLevelWindow due to
+ // generic MDI implementation so use SetLabel rather than SetTitle.
+ // It should cause SetTitle() for top level windows.
+ wxWindow *win = GetFrame();
+ if (!win) return;
- GetDocument()->GetPrintableName(title);
+ wxDocument *doc = GetDocument();
+ if (!doc) return;
- GetFrame()->SetTitle(title);
- }
+ wxString name;
+ doc->GetPrintableName(name);
+ win->SetLabel(name);
}
void wxView::SetDocument(wxDocument *doc)
bool wxView::Close(bool deleteWindow)
{
if (OnClose(deleteWindow))
- return TRUE;
+ return true;
else
- return FALSE;
+ return false;
}
void wxView::Activate(bool activate)
bool wxView::OnClose(bool WXUNUSED(deleteWindow))
{
- return GetDocument() ? GetDocument()->Close() : TRUE;
+ return GetDocument() ? GetDocument()->Close() : true;
}
#if wxUSE_PRINTING_ARCHITECTURE
// Tries to dynamically construct an object of the right class.
wxDocument *wxDocTemplate::CreateDocument(const wxString& path, long flags)
{
- if (!m_docClassInfo)
+ wxDocument *doc = DoCreateDocument();
+ if ( doc == NULL )
+ return (wxDocument *) NULL;
+
+ if (InitDocument(doc, path, flags))
+ {
+ return doc;
+ }
+ else
+ {
return (wxDocument *) NULL;
- wxDocument *doc = (wxDocument *)m_docClassInfo->CreateObject();
+ }
+}
+
+bool wxDocTemplate::InitDocument(wxDocument* doc, const wxString& path, long flags)
+{
doc->SetFilename(path);
doc->SetDocumentTemplate(this);
GetDocumentManager()->AddDocument(doc);
doc->SetCommandProcessor(doc->OnCreateCommandProcessor());
if (doc->OnCreate(path, flags))
- return doc;
+ return true;
else
{
if (GetDocumentManager()->GetDocuments().Member(doc))
doc->DeleteAllViews();
- return (wxDocument *) NULL;
+ return false;
}
}
wxView *wxDocTemplate::CreateView(wxDocument *doc, long flags)
{
- if (!m_viewClassInfo)
+ wxView *view = DoCreateView();
+ if ( view == NULL )
return (wxView *) NULL;
- wxView *view = (wxView *)m_viewClassInfo->CreateObject();
+
view->SetDocument(doc);
if (view->OnCreate(doc, flags))
{
// that of the template
bool wxDocTemplate::FileMatchesTemplate(const wxString& path)
{
+ wxStringTokenizer parser (GetFileFilter(), wxT(";"));
+ wxString anything = wxT ("*");
+ while (parser.HasMoreTokens())
+ {
+ wxString filter = parser.GetNextToken();
+ wxString filterExt = FindExtension (filter);
+ if ( filter.IsSameAs (anything) ||
+ filterExt.IsSameAs (anything) ||
+ filterExt.IsSameAs (FindExtension (path)) )
+ return true;
+ }
return GetDefaultExtension().IsSameAs(FindExtension(path));
}
+wxDocument *wxDocTemplate::DoCreateDocument()
+{
+ if (!m_docClassInfo)
+ return (wxDocument *) NULL;
+
+ return (wxDocument *)m_docClassInfo->CreateObject();
+}
+
+wxView *wxDocTemplate::DoCreateView()
+{
+ if (!m_viewClassInfo)
+ return (wxView *) NULL;
+
+ return (wxView *)m_viewClassInfo->CreateObject();
+}
+
// ----------------------------------------------------------------------------
// wxDocManager
// ----------------------------------------------------------------------------
#if wxUSE_PRINTING_ARCHITECTURE
EVT_MENU(wxID_PRINT, wxDocManager::OnPrint)
- EVT_MENU(wxID_PRINT_SETUP, wxDocManager::OnPrintSetup)
EVT_MENU(wxID_PREVIEW, wxDocManager::OnPreview)
EVT_UPDATE_UI(wxID_PRINT, wxDocManager::OnUpdatePrint)
- EVT_UPDATE_UI(wxID_PRINT_SETUP, wxDocManager::OnUpdatePrintSetup)
EVT_UPDATE_UI(wxID_PREVIEW, wxDocManager::OnUpdatePreview)
#endif
END_EVENT_TABLE()
sm_docManager = (wxDocManager*) NULL;
}
-bool wxDocManager::CloseDocuments(bool force)
+// closes the specified document
+bool wxDocManager::CloseDocument(wxDocument* doc, bool force)
{
- wxNode *node = m_docs.GetFirst();
- while (node)
+ if (doc->Close() || force)
{
- wxDocument *doc = (wxDocument *)node->GetData();
- wxNode *next = node->GetNext();
-
- if (!doc->Close() && !force)
- return FALSE;
-
- // Implicitly deletes the document when the last
- // view is removed (deleted)
+ // Implicitly deletes the document when
+ // the last view is deleted
doc->DeleteAllViews();
- // Check document is deleted
+ // Check we're really deleted
if (m_docs.Member(doc))
delete doc;
+ return true;
+ }
+ return false;
+}
+
+bool wxDocManager::CloseDocuments(bool force)
+{
+ wxList::compatibility_iterator node = m_docs.GetFirst();
+ while (node)
+ {
+ wxDocument *doc = (wxDocument *)node->GetData();
+ wxList::compatibility_iterator next = node->GetNext();
+
+ if (!CloseDocument(doc, force))
+ return false;
+
// This assumes that documents are not connected in
// any way, i.e. deleting one document does NOT
// delete another.
node = next;
}
- return TRUE;
+ return true;
}
bool wxDocManager::Clear(bool force)
{
if (!CloseDocuments(force))
- return FALSE;
+ return false;
+
+ m_currentView = NULL;
- wxNode *node = m_templates.GetFirst();
+ wxList::compatibility_iterator node = m_templates.GetFirst();
while (node)
{
wxDocTemplate *templ = (wxDocTemplate*) node->GetData();
- wxNode* next = node->GetNext();
+ wxList::compatibility_iterator next = node->GetNext();
delete templ;
node = next;
}
- return TRUE;
+ return true;
}
bool wxDocManager::Initialize()
{
m_fileHistory = OnCreateFileHistory();
- return TRUE;
+ return true;
}
wxFileHistory *wxDocManager::OnCreateFileHistory()
void wxDocManager::OnFileCloseAll(wxCommandEvent& WXUNUSED(event))
{
- CloseDocuments(FALSE);
+ CloseDocuments(false);
}
void wxDocManager::OnFileNew(wxCommandEvent& WXUNUSED(event))
{
- CreateDocument( wxT(""), wxDOC_NEW );
+ CreateDocument( wxEmptyString, wxDOC_NEW );
}
void wxDocManager::OnFileOpen(wxCommandEvent& WXUNUSED(event))
{
- if ( !CreateDocument( wxT(""), 0) )
+ if ( !CreateDocument( wxEmptyString, 0) )
{
OnOpenFileFailure();
}
if (printout)
{
wxPrinter printer;
- printer.Print(view->GetFrame(), printout, TRUE);
+ printer.Print(view->GetFrame(), printout, true);
delete printout;
}
#endif // wxUSE_PRINTING_ARCHITECTURE
}
-void wxDocManager::OnPrintSetup(wxCommandEvent& WXUNUSED(event))
-{
-#if wxUSE_PRINTING_ARCHITECTURE
- wxWindow *parentWin = wxTheApp->GetTopWindow();
- wxView *view = GetCurrentView();
- if (view)
- parentWin = view->GetFrame();
-
- wxPrintDialogData data;
-
- wxPrintDialog printerDialog(parentWin, &data);
- printerDialog.GetPrintDialogData().SetSetupDialog(TRUE);
- printerDialog.ShowModal();
-#endif // wxUSE_PRINTING_ARCHITECTURE
-}
-
void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event))
{
#if wxUSE_PRINTING_ARCHITECTURE
if (printout)
{
// Pass two printout objects: for preview, and possible printing.
- wxPrintPreviewBase *preview = (wxPrintPreviewBase *) NULL;
- preview = new wxPrintPreview(printout, view->OnCreatePrintout());
+ wxPrintPreviewBase *preview = new wxPrintPreview(printout, view->OnCreatePrintout());
+ if ( !preview->Ok() )
+ {
+ delete preview;
+ wxMessageBox( _("Sorry, print preview needs a printer to be installed.") );
+ return;
+ }
wxPreviewFrame *frame = new wxPreviewFrame(preview, (wxFrame *)wxTheApp->GetTopWindow(), _("Print Preview"),
wxPoint(100, 100), wxSize(600, 650));
frame->Centre(wxBOTH);
frame->Initialize();
- frame->Show(TRUE);
+ frame->Show(true);
}
#endif // wxUSE_PRINTING_ARCHITECTURE
}
-void wxDocManager::OnUndo(wxCommandEvent& WXUNUSED(event))
+void wxDocManager::OnUndo(wxCommandEvent& event)
{
wxDocument *doc = GetCurrentDocument();
if (!doc)
return;
if (doc->GetCommandProcessor())
doc->GetCommandProcessor()->Undo();
+ else
+ event.Skip();
}
-void wxDocManager::OnRedo(wxCommandEvent& WXUNUSED(event))
+void wxDocManager::OnRedo(wxCommandEvent& event)
{
wxDocument *doc = GetCurrentDocument();
if (!doc)
return;
if (doc->GetCommandProcessor())
doc->GetCommandProcessor()->Redo();
+ else
+ event.Skip();
}
// Handlers for UI update commands
void wxDocManager::OnUpdateFileOpen(wxUpdateUIEvent& event)
{
- event.Enable( TRUE );
+ event.Enable( true );
}
void wxDocManager::OnUpdateFileClose(wxUpdateUIEvent& event)
void wxDocManager::OnUpdateFileNew(wxUpdateUIEvent& event)
{
- event.Enable( TRUE );
+ event.Enable( true );
}
void wxDocManager::OnUpdateFileSave(wxUpdateUIEvent& event)
void wxDocManager::OnUpdateUndo(wxUpdateUIEvent& event)
{
wxDocument *doc = GetCurrentDocument();
- event.Enable( (doc && doc->GetCommandProcessor() && doc->GetCommandProcessor()->CanUndo()) );
- if (doc && doc->GetCommandProcessor())
+ if (!doc)
+ event.Enable(false);
+ else if (!doc->GetCommandProcessor())
+ event.Skip();
+ else
+ {
+ event.Enable( doc->GetCommandProcessor()->CanUndo() );
doc->GetCommandProcessor()->SetMenuStrings();
+ }
}
void wxDocManager::OnUpdateRedo(wxUpdateUIEvent& event)
{
wxDocument *doc = GetCurrentDocument();
- event.Enable( (doc && doc->GetCommandProcessor() && doc->GetCommandProcessor()->CanRedo()) );
- if (doc && doc->GetCommandProcessor())
+ if (!doc)
+ event.Enable(false);
+ else if (!doc->GetCommandProcessor())
+ event.Skip();
+ else
+ {
+ event.Enable( doc->GetCommandProcessor()->CanRedo() );
doc->GetCommandProcessor()->SetMenuStrings();
+ }
}
void wxDocManager::OnUpdatePrint(wxUpdateUIEvent& event)
event.Enable( (doc != (wxDocument*) NULL) );
}
-void wxDocManager::OnUpdatePrintSetup(wxUpdateUIEvent& event)
-{
- event.Enable( TRUE );
-}
-
void wxDocManager::OnUpdatePreview(wxUpdateUIEvent& event)
{
wxDocument *doc = GetCurrentDocument();
if (view)
{
if (view->ProcessEvent(event))
- return TRUE;
+ return true;
}
return wxEvtHandler::ProcessEvent(event);
}
return (wxDocument *) NULL;
}
+ wxDocument* docToClose = NULL;
+
// If we've reached the max number of docs, close the
// first one.
if ( (int)GetDocuments().GetCount() >= m_maxDocsOpen )
{
wxDocument *doc = (wxDocument *)GetDocuments().GetFirst()->GetData();
- if (doc->Close())
- {
- // Implicitly deletes the document when
- // the last view is deleted
- doc->DeleteAllViews();
-
- // Check we're really deleted
- if (m_docs.Member(doc))
- delete doc;
- }
- else
- {
- delete[] templates;
- return (wxDocument *) NULL;
- }
+ docToClose = doc;
}
// New document: user chooses a template, unless there's only one.
{
if (n == 1)
{
+ if (docToClose)
+ {
+ if (!CloseDocument(docToClose, false))
+ {
+ delete[] templates;
+ return NULL;
+ }
+ }
+
wxDocTemplate *temp = templates[0];
delete[] templates;
wxDocument *newDoc = temp->CreateDocument(path, flags);
+
if (newDoc)
{
newDoc->SetDocumentName(temp->GetDocumentName());
newDoc->SetDocumentTemplate(temp);
- newDoc->OnNewDocument();
+ if (!newDoc->OnNewDocument() )
+ {
+ // Document is implicitly deleted by DeleteAllViews
+ newDoc->DeleteAllViews();
+ return NULL;
+ }
}
return newDoc;
}
delete[] templates;
if (temp)
{
+ if (docToClose)
+ {
+ if (!CloseDocument(docToClose, false))
+ {
+ return NULL;
+ }
+ }
+
wxDocument *newDoc = temp->CreateDocument(path, flags);
+
if (newDoc)
{
newDoc->SetDocumentName(temp->GetDocumentName());
newDoc->SetDocumentTemplate(temp);
- newDoc->OnNewDocument();
+ if (!newDoc->OnNewDocument() )
+ {
+ // Document is implicitly deleted by DeleteAllViews
+ newDoc->DeleteAllViews();
+ return NULL;
+ }
}
return newDoc;
}
}
// Existing document
- wxDocTemplate *temp = (wxDocTemplate *) NULL;
+ wxDocTemplate *temp;
- wxString path2(wxT(""));
- if (path != wxT(""))
- path2 = path;
+ wxString path2 = path;
if (flags & wxDOC_SILENT)
+ {
temp = FindTemplateForPath(path2);
+ if (!temp)
+ {
+ // Since we do not add files with non-default extensions to the FileHistory this
+ // can only happen if the application changes the allowed templates in runtime.
+ (void)wxMessageBox(_("Sorry, the format for this file is unknown."),
+ _("Open File"),
+ wxOK | wxICON_EXCLAMATION, wxFindSuitableParent());
+ }
+ }
else
temp = SelectDocumentPath(templates, n, path2, flags);
if (temp)
{
+ if (docToClose)
+ {
+ if (!CloseDocument(docToClose, false))
+ {
+ return NULL;
+ }
+ }
+
+ //see if this file is already open
+ for (size_t i = 0; i < GetDocuments().GetCount(); ++i)
+ {
+ wxDocument* currentDoc = (wxDocument*)(GetDocuments().Item(i)->GetData());
+#ifdef __WXMSW__
+ //file paths are case-insensitive on Windows
+ if (path2.CmpNoCase(currentDoc->GetFilename()) == 0)
+#else
+ if (path2.Cmp(currentDoc->GetFilename()) == 0)
+#endif
+ {
+ //file already open. Just activate it and return
+ if (currentDoc->GetFirstView())
+ {
+ ActivateView(currentDoc->GetFirstView(), true);
+ if (currentDoc->GetDocumentWindow())
+ currentDoc->GetDocumentWindow()->SetFocus();
+ return currentDoc;
+ }
+ }
+ }
+
wxDocument *newDoc = temp->CreateDocument(path2, flags);
if (newDoc)
{
// delete newDoc; // Implicitly deleted by DeleteAllViews
return (wxDocument *) NULL;
}
- AddFileToHistory(path2);
+ // A file that doesn't use the default extension of its document
+ // template cannot be opened via the FileHistory, so we do not
+ // add it.
+ if (temp->FileMatchesTemplate(path2))
+ AddFileToHistory(path2);
}
return newDoc;
}
// Not yet implemented
bool wxDocManager::FlushDoc(wxDocument *WXUNUSED(doc))
{
- return FALSE;
+ return false;
}
wxDocument *wxDocManager::GetCurrentDocument() const
name.Printf(_("unnamed%d"), m_defaultDocumentNameCounter);
m_defaultDocumentNameCounter++;
- return TRUE;
+ return true;
}
// Make a frame title (override this to do something different)
m_fileHistory->AddFileToHistory(file);
}
-void wxDocManager::RemoveFileFromHistory(int i)
+void wxDocManager::RemoveFileFromHistory(size_t i)
{
if (m_fileHistory)
m_fileHistory->RemoveFileFromHistory(i);
}
-wxString wxDocManager::GetHistoryFile(int i) const
+wxString wxDocManager::GetHistoryFile(size_t i) const
{
wxString histFile;
m_fileHistory->AddFilesToMenu();
}
-int wxDocManager::GetNoHistoryFiles() const
+size_t wxDocManager::GetHistoryFilesCount() const
{
- if (m_fileHistory)
- return m_fileHistory->GetNoHistoryFiles();
- else
- return 0;
+ return m_fileHistory ? m_fileHistory->GetCount() : 0;
}
}
// Prompts user to open a file, using file specs in templates.
-// How to implement in wxWindows? Must extend the file selector
-// dialog or implement own; OR match the extension to the
-// template extension.
+// Must extend the file selector dialog or implement own; OR
+// match the extension to the template extension.
wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
#if defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXMAC__)
if (templates[i]->IsVisible())
{
// add a '|' to separate this filter from the previous one
- if ( !descrBuf.IsEmpty() )
+ if ( !descrBuf.empty() )
descrBuf << wxT('|');
descrBuf << templates[i]->GetDescription()
wxString pathTmp = wxFileSelectorEx(_("Select a file"),
m_lastDirectory,
- wxT(""),
+ wxEmptyString,
&FilterIndex,
descrBuf,
0,
parent);
wxDocTemplate *theTemplate = (wxDocTemplate *)NULL;
- if (!pathTmp.IsEmpty())
+ if (!pathTmp.empty())
{
if (!wxFileExists(pathTmp))
{
wxString msgTitle;
- if (!wxTheApp->GetAppName().IsEmpty())
+ if (!wxTheApp->GetAppName().empty())
msgTitle = wxTheApp->GetAppName();
else
msgTitle = wxString(_("File error"));
(void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK | wxICON_EXCLAMATION,
parent);
- path = wxT("");
+ path = wxEmptyString;
return (wxDocTemplate *) NULL;
}
m_lastDirectory = wxPathOnly(pathTmp);
theTemplate = templates[FilterIndex];
if ( !theTemplate )
theTemplate = FindTemplateForPath(path);
+ if ( !theTemplate )
+ {
+ // Since we do not add files with non-default extensions to the FileHistory this
+ // can only happen if the application changes the allowed templates in runtime.
+ (void)wxMessageBox(_("Sorry, the format for this file is unknown."),
+ _("Open File"),
+ wxOK | wxICON_EXCLAMATION, wxFindSuitableParent());
+ }
}
else
{
- path = wxT("");
+ path = wxEmptyString;
}
return theTemplate;
-
-#if 0
- // In all other windowing systems, until we have more advanced
- // file selectors, we must select the document type (template) first, and
- // _then_ pop up the file selector.
- wxDocTemplate *temp = SelectDocumentType(templates, noTemplates);
- if (!temp)
- return (wxDocTemplate *) NULL;
-
- wxChar *pathTmp = wxFileSelector(_("Select a file"), wxT(""), wxT(""),
- temp->GetDefaultExtension(),
- temp->GetFileFilter(),
- 0, wxTheApp->GetTopWindow());
-
- if (pathTmp)
- {
- path = pathTmp;
- return temp;
- }
- else
- return (wxDocTemplate *) NULL;
-#endif // 0
}
wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
int noTemplates, bool sort)
{
- wxArrayString strings(sort);
+ wxArrayString strings;
wxDocTemplate **data = new wxDocTemplate *[noTemplates];
int i;
int n = 0;
-
- for (i = 0; i < noTemplates; i++)
- {
- if (templates[i]->IsVisible())
- {
- int j;
- bool want = TRUE;
- for (j = 0; j < n; j++)
- {
+
+ for (i = 0; i < noTemplates; i++)
+ {
+ if (templates[i]->IsVisible())
+ {
+ int j;
+ bool want = true;
+ for (j = 0; j < n; j++)
+ {
//filter out NOT unique documents + view combinations
- if ( templates[i]->m_docTypeName == data[j]->m_docTypeName &&
+ if ( templates[i]->m_docTypeName == data[j]->m_docTypeName &&
templates[i]->m_viewTypeName == data[j]->m_viewTypeName
)
- want = FALSE;
- }
+ want = false;
+ }
if ( want )
- {
- strings.Add(templates[i]->m_description);
-
- data[n] = templates[i];
- n ++;
- }
- }
- } // for
-
- if (sort)
- {
- // Yes, this will be slow, but template lists
- // are typically short.
- int j;
- n = strings.Count();
- for (i = 0; i < n; i++)
- {
- for (j = 0; j < noTemplates; j++)
- {
- if (strings[i] == templates[j]->m_description)
- data[i] = templates[j];
- }
- }
- }
+ {
+ strings.Add(templates[i]->m_description);
+
+ data[n] = templates[i];
+ n ++;
+ }
+ }
+ } // for
+
+ if (sort)
+ {
+ strings.Sort(); // ascending sort
+ // Yes, this will be slow, but template lists
+ // are typically short.
+ int j;
+ n = strings.Count();
+ for (i = 0; i < n; i++)
+ {
+ for (j = 0; j < noTemplates; j++)
+ {
+ if (strings[i] == templates[j]->m_description)
+ data[i] = templates[j];
+ }
+ }
+ }
wxDocTemplate *theTemplate;
wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates,
int noTemplates, bool sort)
{
- wxArrayString strings(sort);
+ wxArrayString strings;
wxDocTemplate **data = new wxDocTemplate *[noTemplates];
int i;
int n = 0;
-
+
for (i = 0; i < noTemplates; i++)
{
wxDocTemplate *templ = templates[i];
if ( templ->IsVisible() && !templ->GetViewName().empty() )
{
- int j;
- bool want = TRUE;
- for (j = 0; j < n; j++)
- {
+ int j;
+ bool want = true;
+ for (j = 0; j < n; j++)
+ {
//filter out NOT unique views
- if ( templates[i]->m_viewTypeName == data[j]->m_viewTypeName )
- want = FALSE;
- }
+ if ( templates[i]->m_viewTypeName == data[j]->m_viewTypeName )
+ want = false;
+ }
if ( want )
{
- strings.Add(templ->m_viewTypeName);
- data[n] = templ;
- n ++;
- }
+ strings.Add(templ->m_viewTypeName);
+ data[n] = templ;
+ n ++;
+ }
}
}
- if (sort)
- {
- // Yes, this will be slow, but template lists
- // are typically short.
- int j;
- n = strings.Count();
- for (i = 0; i < n; i++)
- {
- for (j = 0; j < noTemplates; j++)
- {
- if (strings[i] == templates[j]->m_viewTypeName)
- data[i] = templates[j];
- }
- }
- }
+ if (sort)
+ {
+ strings.Sort(); // ascending sort
+ // Yes, this will be slow, but template lists
+ // are typically short.
+ int j;
+ n = strings.Count();
+ for (i = 0; i < n; i++)
+ {
+ for (j = 0; j < noTemplates; j++)
+ {
+ if (strings[i] == templates[j]->m_viewTypeName)
+ data[i] = templates[j];
+ }
+ }
+ }
wxDocTemplate *theTemplate;
// Views or windows should inform the document manager
// when a view is going in or out of focus
-void wxDocManager::ActivateView(wxView *view, bool activate, bool WXUNUSED(deleting))
-{
- // If we're deactiving, and if we're not actually deleting the view, then
- // don't reset the current view because we may be going to
- // a window without a view.
- // WHAT DID I MEAN BY THAT EXACTLY?
- /*
- if (deleting)
- {
- if (m_currentView == view)
- m_currentView = NULL;
- }
- else
- */
- {
- if (activate)
- m_currentView = view;
- else
+void wxDocManager::ActivateView(wxView *view, bool activate)
+{
+ if ( activate )
+ {
+ m_currentView = view;
+ }
+ else // deactivate
+ {
+ if ( m_currentView == view )
+ {
+ // don't keep stale pointer
m_currentView = (wxView *) NULL;
+ }
}
}
view->SetFrame(this);
}
-wxDocChildFrame::~wxDocChildFrame()
-{
-}
-
// Extend event processing to search the view's event table
bool wxDocChildFrame::ProcessEvent(wxEvent& event)
{
if (m_childView)
- m_childView->Activate(TRUE);
+ m_childView->Activate(true);
if ( !m_childView || ! m_childView->ProcessEvent(event) )
{
if (!event.IsKindOf(CLASSINFO(wxCommandEvent)) || !GetParent() || !GetParent()->ProcessEvent(event))
return wxEvtHandler::ProcessEvent(event);
else
- return TRUE;
+ return true;
}
else
- return TRUE;
+ return true;
}
void wxDocChildFrame::OnActivate(wxActivateEvent& event)
{
if (m_childView)
{
- bool ans = FALSE;
- if (!event.CanVeto())
- ans = TRUE; // Must delete.
- else
- ans = m_childView->Close(FALSE); // FALSE means don't delete associated window
+ bool ans = event.CanVeto()
+ ? m_childView->Close(false) // false means don't delete associated window
+ : true; // Must delete.
if (ans)
{
- m_childView->Activate(FALSE);
+ m_childView->Activate(false);
delete m_childView;
m_childView = (wxView *) NULL;
m_childDocument = (wxDocument *) NULL;
{
int n = event.GetId() - wxID_FILE1; // the index in MRU list
wxString filename(m_docManager->GetHistoryFile(n));
- if ( !filename.IsEmpty() )
+ if ( !filename.empty() )
{
// verify that the file exists before doing anything else
if ( wxFile::Exists(filename) )
{
// try to open it
- (void)m_docManager->CreateDocument(filename, wxDOC_SILENT);
+ if (!m_docManager->CreateDocument(filename, wxDOC_SILENT))
+ {
+ // remove the file from the MRU list. The user should already be notified.
+ m_docManager->RemoveFileFromHistory(n);
+
+ wxLogError(_("The file '%s' couldn't be opened.\nIt has been removed from the most recently used files list."),
+ filename.c_str());
+ }
}
else
{
if (!m_docManager || !m_docManager->ProcessEvent(event))
return wxEvtHandler::ProcessEvent(event);
else
- return TRUE;
+ return true;
}
// Define the behaviour for the frame closing
// Get the logical pixels per inch of screen and printer
int ppiScreenX, ppiScreenY;
GetPPIScreen(&ppiScreenX, &ppiScreenY);
+ wxUnusedVar(ppiScreenY);
int ppiPrinterX, ppiPrinterY;
GetPPIPrinter(&ppiPrinterX, &ppiPrinterY);
+ wxUnusedVar(ppiPrinterY);
// This scales the DC so that the printout roughly represents the
// the screen scaling. The text point size _should_ be the right size
int w, h;
dc->GetSize(&w, &h);
GetPageSizePixels(&pageWidth, &pageHeight);
+ wxUnusedVar(pageHeight);
// If printer pageWidth == current DC width, then this doesn't
// change. But w might be the preview bitmap width, so scale down.
{
m_printoutView->OnDraw(dc);
}
- return TRUE;
+ return true;
}
bool wxDocPrintout::HasPage(int pageNum)
bool wxDocPrintout::OnBeginDocument(int startPage, int endPage)
{
if (!wxPrintout::OnBeginDocument(startPage, endPage))
- return FALSE;
+ return false;
- return TRUE;
+ return true;
}
void wxDocPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo)
// File history processor
// ----------------------------------------------------------------------------
-wxFileHistory::wxFileHistory(int maxFiles)
+static inline wxChar* MYcopystring(const wxString& s)
+{
+ wxChar* copy = new wxChar[s.length() + 1];
+ return wxStrcpy(copy, s.c_str());
+}
+
+static inline wxChar* MYcopystring(const wxChar* s)
+{
+ wxChar* copy = new wxChar[wxStrlen(s) + 1];
+ return wxStrcpy(copy, s);
+}
+
+wxFileHistory::wxFileHistory(size_t maxFiles, wxWindowID idBase)
{
m_fileMaxFiles = maxFiles;
+ m_idBase = idBase;
m_fileHistoryN = 0;
m_fileHistory = new wxChar *[m_fileMaxFiles];
}
wxFileHistory::~wxFileHistory()
{
- int i;
+ size_t i;
for (i = 0; i < m_fileHistoryN; i++)
delete[] m_fileHistory[i];
delete[] m_fileHistory;
// File history management
void wxFileHistory::AddFileToHistory(const wxString& file)
{
- int i;
+ size_t i;
// Check we don't already have this file
for (i = 0; i < m_fileHistoryN; i++)
{
- if ( m_fileHistory[i] && (file == m_fileHistory[i]) )
+#if defined( __WXMSW__ ) // Add any other OSes with case insensitive file names
+ wxString testString;
+ if ( m_fileHistory[i] )
+ testString = m_fileHistory[i];
+ if ( m_fileHistory[i] && ( file.Lower() == testString.Lower() ) )
+#else
+ if ( m_fileHistory[i] && ( file == m_fileHistory[i] ) )
+#endif
{
// we do have it, move it to the top of the history
RemoveFileFromHistory (i);
// Move existing files (if any) down so we can insert file at beginning.
if (m_fileHistoryN < m_fileMaxFiles)
{
- wxNode* node = m_fileMenus.GetFirst();
+ wxList::compatibility_iterator node = m_fileMenus.GetFirst();
while (node)
{
wxMenu* menu = (wxMenu*) node->GetData();
{
menu->AppendSeparator();
}
- menu->Append(wxID_FILE1+m_fileHistoryN, _("[EMPTY]"));
+ menu->Append(m_idBase+m_fileHistoryN, _("[EMPTY]"));
node = node->GetNext();
}
m_fileHistoryN ++;
{
m_fileHistory[i] = m_fileHistory[i-1];
}
- m_fileHistory[0] = copystring(file);
+ m_fileHistory[0] = MYcopystring(file);
// this is the directory of the last opened file
wxString pathCurrent;
pathInMenu = m_fileHistory[i];
}
+ // we need to quote '&' characters which are used for mnemonics
+ pathInMenu.Replace(_T("&"), _T("&&"));
wxString buf;
buf.Printf(s_MRUEntryFormat, i + 1, pathInMenu.c_str());
- wxNode* node = m_fileMenus.GetFirst();
+ wxList::compatibility_iterator node = m_fileMenus.GetFirst();
while (node)
{
wxMenu* menu = (wxMenu*) node->GetData();
- menu->SetLabel(wxID_FILE1 + i, buf);
+ menu->SetLabel(m_idBase + i, buf);
node = node->GetNext();
}
}
}
}
-void wxFileHistory::RemoveFileFromHistory(int i)
+void wxFileHistory::RemoveFileFromHistory(size_t i)
{
wxCHECK_RET( i < m_fileHistoryN,
wxT("invalid index in wxFileHistory::RemoveFileFromHistory") );
- // delete the element from the array (could use memmove() too...)
- delete [] m_fileHistory[i];
+ // delete the element from the array (could use memmove() too...)
+ delete [] m_fileHistory[i];
- int j;
- for ( j = i; j < m_fileHistoryN - 1; j++ )
- {
- m_fileHistory[j] = m_fileHistory[j + 1];
- }
+ size_t j;
+ for ( j = i; j < m_fileHistoryN - 1; j++ )
+ {
+ m_fileHistory[j] = m_fileHistory[j + 1];
+ }
- wxNode* node = m_fileMenus.GetFirst();
+ wxList::compatibility_iterator node = m_fileMenus.GetFirst();
while ( node )
{
wxMenu* menu = (wxMenu*) node->GetData();
-
// shuffle filenames up
wxString buf;
for ( j = i; j < m_fileHistoryN - 1; j++ )
{
buf.Printf(s_MRUEntryFormat, j + 1, m_fileHistory[j]);
- menu->SetLabel(wxID_FILE1 + j, buf);
+ menu->SetLabel(m_idBase + j, buf);
}
node = node->GetNext();
// delete the last menu item which is unused now
- if (menu->FindItem(wxID_FILE1 + m_fileHistoryN - 1))
- menu->Delete(wxID_FILE1 + m_fileHistoryN - 1);
+ wxWindowID lastItemId = m_idBase + wx_truncate_cast(wxWindowID, m_fileHistoryN) - 1;
+ if (menu->FindItem(lastItemId))
+ {
+ menu->Delete(lastItemId);
+ }
// delete the last separator too if no more files are left
if ( m_fileHistoryN == 1 )
{
- wxMenuItemList::Node *node = menu->GetMenuItems().GetLast();
- if ( node )
+ wxMenuItemList::compatibility_iterator nodeLast = menu->GetMenuItems().GetLast();
+ if ( nodeLast )
{
- wxMenuItem *menuItem = node->GetData();
+ wxMenuItem *menuItem = nodeLast->GetData();
if ( menuItem->IsSeparator() )
{
menu->Delete(menuItem);
m_fileHistoryN--;
}
-wxString wxFileHistory::GetHistoryFile(int i) const
+wxString wxFileHistory::GetHistoryFile(size_t i) const
{
wxString s;
if ( i < m_fileHistoryN )
{
m_fileHistoryN = 0;
wxString buf;
- buf.Printf(wxT("file%d"), m_fileHistoryN+1);
+ buf.Printf(wxT("file%d"), (int)m_fileHistoryN+1);
wxString historyFile;
- while ((m_fileHistoryN < m_fileMaxFiles) && config.Read(buf, &historyFile) && (historyFile != wxT("")))
+ while ((m_fileHistoryN < m_fileMaxFiles) && config.Read(buf, &historyFile) && (!historyFile.empty()))
{
- m_fileHistory[m_fileHistoryN] = copystring((const wxChar*) historyFile);
+ m_fileHistory[m_fileHistoryN] = MYcopystring((const wxChar*) historyFile);
m_fileHistoryN ++;
- buf.Printf(wxT("file%d"), m_fileHistoryN+1);
- historyFile = wxT("");
+ buf.Printf(wxT("file%d"), (int)m_fileHistoryN+1);
+ historyFile = wxEmptyString;
}
AddFilesToMenu();
}
void wxFileHistory::Save(wxConfigBase& config)
{
- int i;
- for (i = 0; i < m_fileHistoryN; i++)
+ size_t i;
+ for (i = 0; i < m_fileMaxFiles; i++)
{
wxString buf;
- buf.Printf(wxT("file%d"), i+1);
- config.Write(buf, wxString(m_fileHistory[i]));
+ buf.Printf(wxT("file%d"), (int)i+1);
+ if (i < m_fileHistoryN)
+ config.Write(buf, wxString(m_fileHistory[i]));
+ else
+ config.Write(buf, wxEmptyString);
}
}
#endif // wxUSE_CONFIG
{
if (m_fileHistoryN > 0)
{
- wxNode* node = m_fileMenus.GetFirst();
+ wxList::compatibility_iterator node = m_fileMenus.GetFirst();
while (node)
{
wxMenu* menu = (wxMenu*) node->GetData();
menu->AppendSeparator();
}
- int i;
+ size_t i;
for (i = 0; i < m_fileHistoryN; i++)
{
if (m_fileHistory[i])
{
wxString buf;
buf.Printf(s_MRUEntryFormat, i+1, m_fileHistory[i]);
- menu->Append(wxID_FILE1+i, buf);
+ menu->Append(m_idBase+i, buf);
}
}
node = node->GetNext();
menu->AppendSeparator();
}
- int i;
+ size_t i;
for (i = 0; i < m_fileHistoryN; i++)
{
if (m_fileHistory[i])
{
wxString buf;
buf.Printf(s_MRUEntryFormat, i+1, m_fileHistory[i]);
- menu->Append(wxID_FILE1+i, buf);
+ menu->Append(m_idBase+i, buf);
}
}
}
{
wxFFile file(filename, _T("rb"));
if ( !file.IsOpened() )
- return FALSE;
+ return false;
char buf[4096];
{
nRead = file.Read(buf, WXSIZEOF(buf));
if ( file.Error() )
- return FALSE;
+ return false;
stream.write(buf, nRead);
if ( !stream )
- return FALSE;
+ return false;
}
while ( !file.Eof() );
- return TRUE;
+ return true;
}
bool wxTransferStreamToFile(wxSTD istream& stream, const wxString& filename)
{
wxFFile file(filename, _T("wb"));
if ( !file.IsOpened() )
- return FALSE;
+ return false;
char buf[4096];
do
if ( !stream.bad() ) // fail may be set on EOF, don't use operator!()
{
if ( !file.Write(buf, stream.gcount()) )
- return FALSE;
+ return false;
}
}
while ( !stream.eof() );
- return TRUE;
+ return true;
}
#else // !wxUSE_STD_IOSTREAM
{
wxFFile file(filename, _T("rb"));
if ( !file.IsOpened() )
- return FALSE;
+ return false;
char buf[4096];
{
nRead = file.Read(buf, WXSIZEOF(buf));
if ( file.Error() )
- return FALSE;
+ return false;
stream.Write(buf, nRead);
if ( !stream )
- return FALSE;
+ return false;
}
while ( !file.Eof() );
- return TRUE;
+ return true;
}
bool wxTransferStreamToFile(wxInputStream& stream, const wxString& filename)
{
wxFFile file(filename, _T("wb"));
if ( !file.IsOpened() )
- return FALSE;
+ return false;
char buf[4096];
do
const size_t nRead = stream.LastRead();
if ( !nRead || !file.Write(buf, nRead) )
- return FALSE;
+ return false;
}
while ( !stream.Eof() );
- return TRUE;
+ return true;
}
#endif // wxUSE_STD_IOSTREAM/!wxUSE_STD_IOSTREAM
#endif // wxUSE_DOC_VIEW_ARCHITECTURE
-
projects / wxWidgets.git / blobdiff