// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #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
#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"
#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/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
// ----------------------------------------------------------------------------
msgTitle = wxString(_("File error"));
#if wxUSE_STD_IOSTREAM
- wxSTD ofstream store(file.mb_str());
+ wxSTD ofstream store(file.mb_str(), wxSTD ios::binary);
if (store.fail() || store.bad())
#else
wxFileOutputStream store(file);
bool wxDocument::DoOpenDocument(const wxString& file)
{
- wxString msgTitle;
- if (!wxTheApp->GetAppName().empty())
- msgTitle = wxTheApp->GetAppName();
- else
- msgTitle = wxString(_("File error"));
-
#if wxUSE_STD_IOSTREAM
- wxSTD ifstream store(file.mb_str());
- if (store.fail() || store.bad())
+ wxSTD ifstream store(file.mb_str(), wxSTD ios::binary);
+ if (!store.fail() && !store.bad())
#else
wxFileInputStream store(file);
- if (store.GetLastError() != wxSTREAM_NO_ERROR)
+ 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() )
+ LoadObject(store);
+ if ( !!store || store.eof() )
#else
- int res = LoadObject(store).GetLastError();
- if ((res != wxSTREAM_NO_ERROR) &&
- (res != wxSTREAM_EOF))
+ 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;
+ return true;
}
- return true;
+ wxLogError(_("Sorry, could not open this file."));
+ return false;
}
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)
// 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));
}
{
newDoc->SetDocumentName(temp->GetDocumentName());
newDoc->SetDocumentTemplate(temp);
- newDoc->OnNewDocument();
+ if (!newDoc->OnNewDocument() )
+ {
+ // Document is implicitly deleted by DeleteAllViews
+ newDoc->DeleteAllViews();
+ return NULL;
+ }
}
return 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;
}
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());
wxList::compatibility_iterator node = m_fileMenus.GetFirst();
wxList::compatibility_iterator node = m_fileMenus.GetFirst();
while ( node )
{
- wxMenu* menu = (wxMenu*) node->GetData();
+ 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(m_idBase + j, buf);
- }
+ // shuffle filenames up
+ wxString buf;
+ for ( j = i; j < m_fileHistoryN - 1; j++ )
+ {
+ buf.Printf(s_MRUEntryFormat, j + 1, m_fileHistory[j]);
+ menu->SetLabel(m_idBase + j, buf);
+ }
- node = node->GetNext();
+ node = node->GetNext();
// delete the last menu item which is unused now
- wxWindowID lastItemId = m_idBase + 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::compatibility_iterator 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);
#endif // wxUSE_STD_IOSTREAM/!wxUSE_STD_IOSTREAM
#endif // wxUSE_DOC_VIEW_ARCHITECTURE
-
projects / wxWidgets.git / blobdiff