Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxImage::Rotate corrections added; docview improvements (menus updated properly)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6159 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-02-20 12:40:08 +00:00
parent 00cf120892
commit f250631042
5 changed files with 157 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
src/common/docview.cpp
View File

@@ -562,10 +562,11 @@ void wxView::OnChangeFilename()
{
if (GetFrame() && GetDocument())
{
wxString name;
GetDocument()->GetPrintableName(name);
wxString title;
GetFrame()->SetTitle(name);
GetDocument()->GetPrintableName(title);
GetFrame()->SetTitle(title);
}
}
@@ -696,13 +697,29 @@ BEGIN_EVENT_TABLE(wxDocManager, wxEvtHandler)
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;
@@ -712,6 +729,7 @@ wxDocManager::wxDocManager(long flags, bool initialize)
m_fileHistory = (wxFileHistory *) NULL;
if (initialize)
Initialize();
sm_docManager = this;
}
wxDocManager::~wxDocManager()
@@ -719,6 +737,7 @@ wxDocManager::~wxDocManager()
Clear();
if (m_fileHistory)
delete m_fileHistory;
sm_docManager = (wxDocManager*) NULL;
}
bool wxDocManager::Clear(bool force)
@@ -889,6 +908,71 @@ void wxDocManager::OnRedo(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)
@@ -1093,6 +1177,24 @@ bool wxDocManager::MakeDefaultName(wxString& name)
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))
{