#include "wx/intl.h"
#endif
+
#ifdef __WXGTK__
#include "wx/mdi.h"
#endif
#include "wx/choicdlg.h"
#include "wx/docview.h"
#include "wx/confbase.h"
+#include "wx/file.h"
#include <stdio.h>
#include <string.h>
static inline wxString FindExtension(const wxChar *path);
+// ----------------------------------------------------------------------------
+// local constants
+// ----------------------------------------------------------------------------
+
+static const wxChar *s_MRUEntryFormat = wxT("&%d %s");
+
// ============================================================================
// implementation
// ============================================================================
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);
wxString path, name, ext;
wxSplitPath(fileName, & path, & name, & ext);
- if (ext.IsEmpty() || ext == _T(""))
+ if (ext.IsEmpty() || ext == wxT(""))
{
fileName += ".";
fileName += docTemplate->GetDefaultExtension();
return FALSE;
wxString msgTitle;
- if (wxTheApp->GetAppName() != _T(""))
+ if (wxTheApp->GetAppName() != wxT(""))
msgTitle = wxTheApp->GetAppName();
else
msgTitle = wxString(_("File error"));
// Saving error
return FALSE;
}
- if (SaveObject(store)==FALSE)
+ if (!SaveObject(store))
{
(void)wxMessageBox(_("Sorry, could not save this file."), msgTitle, wxOK | wxICON_EXCLAMATION,
GetDocumentWindow());
return FALSE;
wxString msgTitle;
- if (wxTheApp->GetAppName() != _T(""))
+ if (wxTheApp->GetAppName() != wxT(""))
msgTitle = wxTheApp->GetAppName();
else
msgTitle = wxString(_("File error"));
GetDocumentWindow());
return FALSE;
}
- if (LoadObject(store)==FALSE)
+ if (!LoadObject(store))
{
(void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK|wxICON_EXCLAMATION,
GetDocumentWindow());
#if wxUSE_STD_IOSTREAM
istream& wxDocument::LoadObject(istream& stream)
+#else
+wxInputStream& wxDocument::LoadObject(wxInputStream& stream)
+#endif
{
return stream;
}
+#if wxUSE_STD_IOSTREAM
ostream& wxDocument::SaveObject(ostream& stream)
-{
- return stream;
-}
#else
-bool wxDocument::LoadObject(wxInputStream& stream)
-{
- return TRUE;
-}
-
-bool wxDocument::SaveObject(wxOutputStream& stream)
+wxOutputStream& wxDocument::SaveObject(wxOutputStream& stream)
+#endif
{
- return TRUE;
+ return stream;
}
-#endif
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;
GetPrintableName(title);
wxString msgTitle;
- if (wxTheApp->GetAppName() != _T(""))
+ if (wxTheApp->GetAppName() != wxT(""))
msgTitle = wxTheApp->GetAppName();
else
msgTitle = wxString(_("Warning"));
wxView::~wxView()
{
- GetDocumentManager()->ActivateView(this, FALSE, TRUE);
+// GetDocumentManager()->ActivateView(this, FALSE, TRUE);
m_viewDocument->RemoveView(this);
}
wxPrintDialogData data;
- wxPrintDialog printerDialog(parentWin, & data);
+ wxPrintDialog printerDialog(parentWin, &data);
printerDialog.GetPrintDialogData().SetSetupDialog(TRUE);
printerDialog.ShowModal();
#endif // wxUSE_PRINTING_ARCHITECTURE
// Existing document
wxDocTemplate *temp = (wxDocTemplate *) NULL;
- wxString path2(_T(""));
- if (path != _T(""))
+ wxString path2(wxT(""));
+ if (path != wxT(""))
path2 = path;
if (flags & wxDOC_SILENT)
m_fileHistory->AddFileToHistory(file);
}
+void wxDocManager::RemoveFileFromHistory(int i)
+{
+ if (m_fileHistory)
+ m_fileHistory->RemoveFileFromHistory(i);
+}
+
wxString wxDocManager::GetHistoryFile(int i) const
{
wxString histFile;
// template extension.
wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
-#ifdef __WXMSW__
+#if defined(__WXMSW__) || defined(__WXGTK__)
int noTemplates,
#else
int WXUNUSED(noTemplates),
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;
{
// 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,
if (!pathTmp.IsEmpty())
{
+ m_lastDirectory = wxPathOnly(pathTmp);
+
path = pathTmp;
wxString theExt = FindExtension(path);
if (!theExt)
}
else
{
- path = _T("");
+ path = wxT("");
return (wxDocTemplate *) NULL;
}
#if 0
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());
{
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 ++;
}
}
wxDocTemplate *theTemplate = (wxDocTemplate *)wxGetSingleChoiceData(_("Select a document template"), _("Templates"), n,
- strings, (char **)data);
+ strings, (void **)data);
delete[] strings;
delete[] data;
return theTemplate;
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;
void wxDocParentFrame::OnMRUFile(wxCommandEvent& event)
{
- wxString f(m_docManager->GetHistoryFile(event.GetSelection() - wxID_FILE1));
- if (f != _T(""))
- (void)m_docManager->CreateDocument(f, wxDOC_SILENT);
+ int n = event.GetSelection() - wxID_FILE1; // the index in MRU list
+ wxString filename(m_docManager->GetHistoryFile(n));
+ if ( !filename.IsEmpty() )
+ {
+ // verify that the file exists before doing anything else
+ if ( wxFile::Exists(filename) )
+ {
+ // try to open it
+ (void)m_docManager->CreateDocument(filename, wxDOC_SILENT);
+ }
+ else
+ {
+ // remove the bogus filename from the MRU list and notify the user
+ // about it
+ m_docManager->RemoveFileFromHistory(n);
+
+ wxLogError(_("The file '%s' doesn't exist and couldn't be opened.\n"
+ "It has been also removed from the MRU files list."),
+ filename.c_str());
+ }
+ }
}
// Extend event processing to search the view's event table
#if wxUSE_PRINTING_ARCHITECTURE
wxDocPrintout::wxDocPrintout(wxView *view, const wxString& title)
- : wxPrintout(WXSTRINGCAST title)
+ : wxPrintout(title)
{
m_printoutView = view;
}
{
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;
{
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);
// 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);
if (m_fileHistory[i])
{
wxString buf;
- buf.Printf(_T("&%d %s"), i+1, m_fileHistory[i]);
+ buf.Printf(s_MRUEntryFormat, i+1, m_fileHistory[i]);
wxNode* node = m_fileMenus.First();
while (node)
{
}
}
+void wxFileHistory::RemoveFileFromHistory(int i)
+{
+ wxCHECK_RET( i < m_fileHistoryN,
+ wxT("invalid index in wxFileHistory::RemoveFileFromHistory") );
+
+ wxNode* node = m_fileMenus.First();
+ while ( node )
+ {
+ wxMenu* menu = (wxMenu*) node->Data();
+
+ // 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];
+ }
+
+ // 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);
+ }
+
+ 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)
{
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);
+ buf.Printf(wxT("file%d"), m_fileHistoryN+1);
historyFile = "";
}
AddFilesToMenu();
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]));
}
}
if (m_fileHistory[i])
{
wxString buf;
- buf.Printf(_T("&%d %s"), i+1, m_fileHistory[i]);
+ buf.Printf(s_MRUEntryFormat, i+1, m_fileHistory[i]);
menu->Append(wxID_FILE1+i, buf);
}
}
if (m_fileHistory[i])
{
wxString buf;
- buf.Printf(_T("&%d %s"), i+1, m_fileHistory[i]);
+ buf.Printf(s_MRUEntryFormat, i+1, m_fileHistory[i]);
menu->Append(wxID_FILE1+i, buf);
}
}
projects / wxWidgets.git / blobdiff