// wxWindows macros
// ----------------------------------------------------------------------------
-#if !USE_SHARED_LIBRARY
IMPLEMENT_ABSTRACT_CLASS(wxDocument, wxEvtHandler)
IMPLEMENT_ABSTRACT_CLASS(wxView, wxEvtHandler)
IMPLEMENT_ABSTRACT_CLASS(wxDocTemplate, wxObject)
IMPLEMENT_CLASS(wxCommand, wxObject)
IMPLEMENT_DYNAMIC_CLASS(wxCommandProcessor, wxObject)
IMPLEMENT_DYNAMIC_CLASS(wxFileHistory, wxObject)
-#endif
// ----------------------------------------------------------------------------
// function prototypes
// local constants
// ----------------------------------------------------------------------------
-static const char *s_MRUEntryFormat = _T("&%d %s");
+static const wxChar *s_MRUEntryFormat = wxT("&%d %s");
// ============================================================================
// implementation
m_documentModified = FALSE;
m_documentParent = parent;
m_documentTemplate = (wxDocTemplate *) NULL;
+ m_commandProcessor = (wxCommandProcessor*) NULL;
m_savedYet = FALSE;
}
if (m_commandProcessor)
delete m_commandProcessor;
- GetDocumentManager()->RemoveDocument(this);
+ if (GetDocumentManager())
+ GetDocumentManager()->RemoveDocument(this);
// Not safe to do here, since it'll invoke virtual view functions
// expecting to see valid derived objects: and by the time we get here,
// deleted.
bool wxDocument::DeleteAllViews()
{
+ wxDocManager* manager = GetDocumentManager();
+
wxNode *node = m_documentViews.First();
while (node)
{
delete view; // Deletes node implicitly
node = next;
}
+ // 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;
}
wxDocManager *wxDocument::GetDocumentManager() const
{
- return m_documentTemplate->GetDocumentManager();
+ return (m_documentTemplate ? m_documentTemplate->GetDocumentManager() : (wxDocManager*) NULL);
}
bool wxDocument::OnNewDocument()
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 tmp = wxFileSelector(_("Save as"),
docTemplate->GetDirectory(),
- GetFilename(),
+ wxFileNameFromPath(GetFilename()),
docTemplate->GetDefaultExtension(),
docTemplate->GetFileFilter(),
wxSAVE | wxOVERWRITE_PROMPT,
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"));
#if wxUSE_STD_IOSTREAM
- ofstream store(wxString(file.fn_str()));
+ ofstream store(wxString(file.fn_str()).mb_str());
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,
return FALSE;
wxString msgTitle;
- if (wxTheApp->GetAppName() != _T(""))
+ if (wxTheApp->GetAppName() != wxT(""))
msgTitle = wxTheApp->GetAppName();
else
msgTitle = wxString(_("File error"));
#if wxUSE_STD_IOSTREAM
- ifstream store(wxString(file.fn_str()));
+ ifstream store(wxString(file.fn_str()).mb_str());
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());
// 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"));
// 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);
}
{
if (GetFrame() && GetDocument())
{
- wxString name;
- GetDocument()->GetPrintableName(name);
+ wxString title;
+
+ GetDocument()->GetPrintableName(title);
- GetFrame()->SetTitle(name);
+ GetFrame()->SetTitle(title);
}
}
return doc;
else
{
- delete doc;
+ if (GetDocumentManager()->GetDocuments().Member(doc))
+ doc->DeleteAllViews();
return (wxDocument *) NULL;
}
}
EVT_MENU(wxID_SAVEAS, wxDocManager::OnFileSaveAs)
EVT_MENU(wxID_UNDO, wxDocManager::OnUndo)
EVT_MENU(wxID_REDO, wxDocManager::OnRedo)
+
+ EVT_UPDATE_UI(wxID_OPEN, wxDocManager::OnUpdateFileOpen)
+ EVT_UPDATE_UI(wxID_CLOSE, wxDocManager::OnUpdateFileClose)
+ EVT_UPDATE_UI(wxID_REVERT, wxDocManager::OnUpdateFileRevert)
+ EVT_UPDATE_UI(wxID_NEW, wxDocManager::OnUpdateFileNew)
+ EVT_UPDATE_UI(wxID_SAVE, wxDocManager::OnUpdateFileSave)
+ EVT_UPDATE_UI(wxID_SAVEAS, wxDocManager::OnUpdateFileSaveAs)
+ EVT_UPDATE_UI(wxID_UNDO, wxDocManager::OnUpdateUndo)
+ EVT_UPDATE_UI(wxID_REDO, wxDocManager::OnUpdateRedo)
+
#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()
+wxDocManager* wxDocManager::sm_docManager = (wxDocManager*) NULL;
+
wxDocManager::wxDocManager(long flags, bool initialize)
{
m_defaultDocumentNameCounter = 1;
m_fileHistory = (wxFileHistory *) NULL;
if (initialize)
Initialize();
+ sm_docManager = this;
}
wxDocManager::~wxDocManager()
Clear();
if (m_fileHistory)
delete m_fileHistory;
+ sm_docManager = (wxDocManager*) NULL;
}
bool wxDocManager::Clear(bool force)
void wxDocManager::OnFileOpen(wxCommandEvent& WXUNUSED(event))
{
- CreateDocument(wxString(""), 0);
+ if ( !CreateDocument(wxString(""), 0) )
+ {
+ OnOpenFileFailure();
+ }
}
void wxDocManager::OnFileRevert(wxCommandEvent& WXUNUSED(event))
doc->GetCommandProcessor()->Redo();
}
+// Handlers for UI update commands
+
+void wxDocManager::OnUpdateFileOpen(wxUpdateUIEvent& event)
+{
+ event.Enable( TRUE );
+}
+
+void wxDocManager::OnUpdateFileClose(wxUpdateUIEvent& event)
+{
+ wxDocument *doc = GetCurrentDocument();
+ event.Enable( (doc != (wxDocument*) NULL) );
+}
+
+void wxDocManager::OnUpdateFileRevert(wxUpdateUIEvent& event)
+{
+ wxDocument *doc = GetCurrentDocument();
+ event.Enable( (doc != (wxDocument*) NULL) );
+}
+
+void wxDocManager::OnUpdateFileNew(wxUpdateUIEvent& event)
+{
+ event.Enable( TRUE );
+}
+
+void wxDocManager::OnUpdateFileSave(wxUpdateUIEvent& event)
+{
+ wxDocument *doc = GetCurrentDocument();
+ event.Enable( (doc != (wxDocument*) NULL) );
+}
+
+void wxDocManager::OnUpdateFileSaveAs(wxUpdateUIEvent& event)
+{
+ wxDocument *doc = GetCurrentDocument();
+ event.Enable( (doc != (wxDocument*) NULL) );
+}
+
+void wxDocManager::OnUpdateUndo(wxUpdateUIEvent& event)
+{
+ wxDocument *doc = GetCurrentDocument();
+ event.Enable( (doc && doc->GetCommandProcessor() && doc->GetCommandProcessor()->CanUndo()) );
+}
+
+void wxDocManager::OnUpdateRedo(wxUpdateUIEvent& event)
+{
+ wxDocument *doc = GetCurrentDocument();
+ event.Enable( (doc && doc->GetCommandProcessor() && doc->GetCommandProcessor()->CanRedo()) );
+}
+
+void wxDocManager::OnUpdatePrint(wxUpdateUIEvent& event)
+{
+ wxDocument *doc = GetCurrentDocument();
+ event.Enable( (doc != (wxDocument*) NULL) );
+}
+
+void wxDocManager::OnUpdatePrintSetup(wxUpdateUIEvent& event)
+{
+ event.Enable( TRUE );
+}
+
+void wxDocManager::OnUpdatePreview(wxUpdateUIEvent& event)
+{
+ wxDocument *doc = GetCurrentDocument();
+ event.Enable( (doc != (wxDocument*) NULL) );
+}
+
wxView *wxDocManager::GetCurrentView() const
{
if (m_currentView)
// Existing document
wxDocTemplate *temp = (wxDocTemplate *) NULL;
- wxString path2(_T(""));
- if (path != _T(""))
+ wxString path2(wxT(""));
+ if (path != wxT(""))
path2 = path;
if (flags & wxDOC_SILENT)
newDoc->SetDocumentTemplate(temp);
if (!newDoc->OnOpenDocument(path2))
{
- delete newDoc;
+ newDoc->DeleteAllViews();
+ // delete newDoc; // Implicitly deleted by DeleteAllViews
return (wxDocument *) NULL;
}
AddFileToHistory(path2);
}
return newDoc;
}
- else
- return (wxDocument *) NULL;
+
+ return (wxDocument *) NULL;
}
wxView *wxDocManager::CreateView(wxDocument *doc, long flags)
return TRUE;
}
+// Make a frame title (override this to do something different)
+// If docName is empty, a document is not currently active.
+wxString wxDocManager::MakeFrameTitle(wxDocument* doc)
+{
+ wxString appName = wxTheApp->GetAppName();
+ wxString title;
+ if (!doc)
+ title = appName;
+ else
+ {
+ wxString docName;
+ doc->GetPrintableName(docName);
+ title = docName + wxString(_(" - ")) + appName;
+ }
+ return title;
+}
+
+
// Not yet implemented
wxDocTemplate *wxDocManager::MatchTemplate(const wxString& WXUNUSED(path))
{
return theTemplate;
}
+// Try to get a more suitable parent frame than the top window,
+// for selection dialogs. Otherwise you may get an unexpected
+// window being activated when a dialog is shown.
+static wxWindow* wxFindSuitableParent()
+{
+ wxWindow* parent = wxTheApp->GetTopWindow();
+
+ wxWindow* focusWindow = wxWindow::FindFocus();
+ if (focusWindow)
+ {
+ while (focusWindow &&
+ !focusWindow->IsKindOf(CLASSINFO(wxDialog)) &&
+ !focusWindow->IsKindOf(CLASSINFO(wxFrame)))
+
+ focusWindow = focusWindow->GetParent();
+
+ if (focusWindow)
+ parent = focusWindow;
+ }
+ return parent;
+}
+
// 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.
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;
+ int FilterIndex = -1;
+
+ wxWindow* parent = wxFindSuitableParent();
+
wxString pathTmp = wxFileSelectorEx(_("Select a file"),
- _T(""),
- _T(""),
+ m_lastDirectory,
+ wxT(""),
&FilterIndex,
descrBuf,
0,
- wxTheApp->GetTopWindow());
+ parent);
+ wxDocTemplate *theTemplate = (wxDocTemplate *)NULL;
if (!pathTmp.IsEmpty())
{
- path = pathTmp;
- wxString theExt = FindExtension(path);
- if (!theExt)
+ if (!wxFileExists(pathTmp))
+ {
+ wxString msgTitle;
+ if (!wxTheApp->GetAppName().IsEmpty())
+ msgTitle = wxTheApp->GetAppName();
+ else
+ msgTitle = wxString(_("File error"));
+
+ (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK | wxICON_EXCLAMATION,
+ parent);
+
+ path = wxT("");
return (wxDocTemplate *) NULL;
+ }
+ m_lastDirectory = wxPathOnly(pathTmp);
- // This is dodgy in that we're selecting the template on the
- // basis of the file extension, which may not be a standard
- // 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];
+ path = pathTmp;
- return theTemplate;
+ // first choose the template using the extension, if this fails (i.e.
+ // wxFileSelectorEx() didn't fill it), then use the path
+ if ( FilterIndex != -1 )
+ theTemplate = templates[FilterIndex];
+ if ( !theTemplate )
+ theTemplate = FindTemplateForPath(path);
}
else
{
- path = _T("");
- return (wxDocTemplate *) NULL;
+ path = wxT("");
}
+
+ 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
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());
}
wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
- int noTemplates)
+ int noTemplates, bool sort)
{
- wxChar **strings = new wxChar *[noTemplates];
- wxChar **data = new wxChar *[noTemplates];
+ wxArrayString strings(sort);
+ wxDocTemplate **data = new wxDocTemplate *[noTemplates];
int i;
int n = 0;
- for (i = 0; i < noTemplates; i++)
- {
- if (templates[i]->IsVisible())
- {
- strings[n] = WXSTRINGCAST templates[i]->m_description;
- data[n] = (wxChar *)templates[i];
- n ++;
- }
- }
- if (n == 0)
- {
- delete[] strings;
- delete[] data;
- return (wxDocTemplate *) NULL;
- }
- else if (n == 1)
- {
- wxDocTemplate *temp = (wxDocTemplate *)data[0];
- delete[] strings;
- delete[] data;
- return temp;
+ for (i = 0; i < noTemplates; i++)
+ {
+ if (templates[i]->IsVisible())
+ {
+ strings.Add(templates[i]->m_description);
+ if (!sort)
+ {
+ 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];
+ }
+ }
+ }
+
+ wxDocTemplate *theTemplate;
+
+ switch ( n )
+ {
+ case 0:
+ // no visible templates, hence nothing to choose from
+ theTemplate = NULL;
+ break;
+
+ case 1:
+ // don't propose the user to choose if he heas no choice
+ theTemplate = data[0];
+ break;
+
+ default:
+ // propose the user to choose one of several
+ theTemplate = (wxDocTemplate *)wxGetSingleChoiceData
+ (
+ _("Select a document template"),
+ _("Templates"),
+ strings,
+ (void **)data,
+ wxFindSuitableParent()
+ );
}
- wxDocTemplate *theTemplate = (wxDocTemplate *)wxGetSingleChoiceData(_("Select a document template"), _("Templates"), n,
- strings, (char **)data);
- delete[] strings;
delete[] data;
+
return theTemplate;
}
wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates,
- int noTemplates)
+ int noTemplates, bool sort)
{
- wxChar **strings = new wxChar *[noTemplates];
- wxChar **data = new wxChar *[noTemplates];
+ wxArrayString strings(sort);
+ wxDocTemplate **data = new wxDocTemplate *[noTemplates];
int i;
int n = 0;
for (i = 0; i < noTemplates; i++)
{
- if (templates[i]->IsVisible() && (templates[i]->GetViewName() != _T("")))
+ wxDocTemplate *templ = templates[i];
+ if ( templ->IsVisible() && !templ->GetViewName().empty() )
{
- strings[n] = WXSTRINGCAST templates[i]->m_viewTypeName;
- data[n] = (wxChar *)templates[i];
- n ++;
+ strings.Add(templ->m_viewTypeName);
+ if (!sort)
+ {
+ data[n] = templ;
+ n ++;
+ }
}
}
- wxDocTemplate *theTemplate = (wxDocTemplate *)wxGetSingleChoiceData(_("Select a document view"), _("Views"), n,
- strings, (char **)data);
- delete[] strings;
+
+ 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];
+ }
+ }
+ }
+
+ wxDocTemplate *theTemplate;
+
+ // the same logic as above
+ switch ( n )
+ {
+ case 0:
+ theTemplate = (wxDocTemplate *)NULL;
+ break;
+
+ case 1:
+ theTemplate = data[0];
+ break;
+
+ default:
+ theTemplate = (wxDocTemplate *)wxGetSingleChoiceData
+ (
+ _("Select a document view"),
+ _("Views"),
+ strings,
+ (void **)data,
+ wxFindSuitableParent()
+ );
+
+ }
+
delete[] data;
return theTemplate;
}
void wxDocParentFrame::OnMRUFile(wxCommandEvent& event)
{
- int n = event.GetSelection() - wxID_FILE1; // the index in MRU list
+ int n = event.GetId() - wxID_FILE1; // the index in MRU list
wxString filename(m_docManager->GetHistoryFile(n));
if ( !filename.IsEmpty() )
{
// 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."),
+ wxLogError(_("The file '%s' doesn't exist and couldn't be opened.\nIt has been also removed from the MRU files list."),
filename.c_str());
}
}
#if wxUSE_PRINTING_ARCHITECTURE
wxDocPrintout::wxDocPrintout(wxView *view, const wxString& title)
- : wxPrintout(WXSTRINGCAST title)
+ : wxPrintout(title)
{
m_printoutView = view;
}
m_maxNoCommands = maxCommands;
m_currentCommand = (wxNode *) NULL;
m_commandEditMenu = (wxMenu *) NULL;
+ m_undoAccelerator = wxT("\tCtrl+Z");
+ m_redoAccelerator = wxT("\tCtrl+Y");
}
wxCommandProcessor::~wxCommandProcessor()
{
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;
+ buf = wxString(_("&Undo ")) + commandName + m_undoAccelerator;
else
- buf = wxString(_("Can't &Undo ")) + commandName;
+ buf = wxString(_("Can't &Undo ")) + commandName + m_undoAccelerator;
m_commandEditMenu->SetLabel(wxID_UNDO, buf);
m_commandEditMenu->Enable(wxID_UNDO, canUndo);
{
wxCommand *redoCommand = (wxCommand *)m_currentCommand->Next()->Data();
wxString redoCommandName(redoCommand->GetName());
- if (redoCommandName == _T("")) redoCommandName = _("Unnamed command");
- buf = wxString(_("&Redo ")) + redoCommandName;
+ if (redoCommandName == wxT("")) redoCommandName = _("Unnamed command");
+ buf = wxString(_("&Redo ")) + redoCommandName + m_redoAccelerator;
m_commandEditMenu->SetLabel(wxID_REDO, buf);
m_commandEditMenu->Enable(wxID_REDO, TRUE);
}
else
{
- m_commandEditMenu->SetLabel(wxID_REDO, _("&Redo"));
+ m_commandEditMenu->SetLabel(wxID_REDO, _("&Redo") + m_redoAccelerator);
m_commandEditMenu->Enable(wxID_REDO, FALSE);
}
}
else
{
- m_commandEditMenu->SetLabel(wxID_UNDO, _("&Undo"));
+ m_commandEditMenu->SetLabel(wxID_UNDO, _("&Undo") + m_undoAccelerator);
m_commandEditMenu->Enable(wxID_UNDO, FALSE);
if (m_commands.Number() == 0)
{
- m_commandEditMenu->SetLabel(wxID_REDO, _("&Redo"));
+ m_commandEditMenu->SetLabel(wxID_REDO, _("&Redo") + m_redoAccelerator);
m_commandEditMenu->Enable(wxID_REDO, FALSE);
}
else
// 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");
- buf = wxString(_("&Redo ")) + redoCommandName;
+ if (redoCommandName == wxT("")) redoCommandName = _("Unnamed command");
+ buf = wxString(_("&Redo ")) + redoCommandName + m_redoAccelerator;
m_commandEditMenu->SetLabel(wxID_REDO, buf);
m_commandEditMenu->Enable(wxID_REDO, TRUE);
}
void wxFileHistory::AddFileToHistory(const wxString& file)
{
int i;
+
// Check we don't already have this file
for (i = 0; i < m_fileHistoryN; i++)
{
- if (m_fileHistory[i] && wxString(m_fileHistory[i]) == file)
+ if ( m_fileHistory[i] && (file == m_fileHistory[i]) )
+ {
+ // we do have it, move it to the top of the history
+ RemoveFileFromHistory (i);
+ AddFileToHistory (file);
return;
+ }
}
- // Add to the project file history:
- // Move existing files (if any) down so we can insert file at beginning.
-
- // First delete filename that has popped off the end of the array (if any)
- if (m_fileHistoryN == m_fileMaxFiles)
+ // if we already have a full history, delete the one at the end
+ if ( m_fileMaxFiles == m_fileHistoryN )
{
- delete[] m_fileHistory[m_fileMaxFiles-1];
- m_fileHistory[m_fileMaxFiles-1] = (wxChar *) NULL;
+ RemoveFileFromHistory (m_fileHistoryN - 1);
+ AddFileToHistory (file);
+ return;
}
+
+ // Add to the project file history:
+ // Move existing files (if any) down so we can insert file at beginning.
if (m_fileHistoryN < m_fileMaxFiles)
{
wxNode* node = m_fileMenus.First();
}
m_fileHistory[0] = copystring(file);
+ // this is the directory of the last opened file
+ wxString pathCurrent;
+ wxSplitPath( m_fileHistory[0], &pathCurrent, NULL, NULL );
for (i = 0; i < m_fileHistoryN; i++)
- if (m_fileHistory[i])
+ {
+ if ( m_fileHistory[i] )
{
+ // if in same directory just show the filename; otherwise the full
+ // path
+ wxString pathInMenu, path, filename, ext;
+ wxSplitPath( m_fileHistory[i], &path, &filename, &ext );
+ if ( path == pathCurrent )
+ {
+ pathInMenu = filename;
+ if ( !ext.empty() )
+ pathInMenu = pathInMenu + wxFILE_SEP_EXT + ext;
+ }
+ else
+ {
+ // absolute path; could also set relative path
+ pathInMenu = m_fileHistory[i];
+ }
+
wxString buf;
- buf.Printf(s_MRUEntryFormat, i+1, m_fileHistory[i]);
+ buf.Printf(s_MRUEntryFormat, i + 1, pathInMenu.c_str());
wxNode* node = m_fileMenus.First();
while (node)
{
wxMenu* menu = (wxMenu*) node->Data();
- menu->SetLabel(wxID_FILE1+i, buf);
+ menu->SetLabel(wxID_FILE1 + i, buf);
node = node->Next();
}
}
+ }
}
void wxFileHistory::RemoveFileFromHistory(int i)
{
wxCHECK_RET( i < m_fileHistoryN,
- _T("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
+ wxT("invalid index in wxFileHistory::RemoveFileFromHistory") );
// delete the element from the array (could use memmove() too...)
delete [] m_fileHistory[i];
m_fileHistory[j] = m_fileHistory[j + 1];
}
+ wxNode* node = m_fileMenus.First();
+ while ( node )
+ {
+ wxMenu* menu = (wxMenu*) node->Data();
+
+
// shuffle filenames up
wxString buf;
for ( j = i; j < m_fileHistoryN - 1; j++ )
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
+ if (menu->FindItem(wxID_FILE1 + m_fileHistoryN - 1))
+ 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);
- historyFile = "";
+ buf.Printf(wxT("file%d"), m_fileHistoryN+1);
+ historyFile = wxT("");
}
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]));
}
}
FILE *fd1;
int ch;
- if ((fd1 = fopen (filename.fn_str(), "rb")) == NULL)
+ if ((fd1 = wxFopen (filename.fn_str(), _T("rb"))) == NULL)
return FALSE;
while ((ch = getc (fd1)) != EOF)
FILE *fd1;
int ch;
- if ((fd1 = fopen (filename.fn_str(), "wb")) == NULL)
+ if ((fd1 = wxFopen (filename.fn_str(), _T("wb"))) == NULL)
{
return FALSE;
}
fclose (fd1);
return TRUE;
}
+#else
+bool wxTransferFileToStream(const wxString& filename, wxOutputStream& stream)
+{
+ FILE *fd1;
+ int ch;
+
+ if ((fd1 = wxFopen (filename, wxT("rb"))) == NULL)
+ return FALSE;
+
+ while ((ch = getc (fd1)) != EOF)
+ stream.PutC((char) ch);
+
+ fclose (fd1);
+ return TRUE;
+}
+
+bool wxTransferStreamToFile(wxInputStream& stream, const wxString& filename)
+{
+ FILE *fd1;
+ char ch;
+
+ if ((fd1 = wxFopen (filename, wxT("wb"))) == NULL)
+ {
+ return FALSE;
+ }
+
+ int len = stream.StreamSize();
+ // TODO: is this the correct test for EOF?
+ while (stream.TellI() < (len - 1))
+ {
+ ch = stream.GetC();
+ putc (ch, fd1);
+ }
+ fclose (fd1);
+ return TRUE;
+}
#endif
#endif // wxUSE_DOC_VIEW_ARCHITECTURE
projects / wxWidgets.git / blobdiff