Put some life into GTK 2.0 drawing.

[wxWidgets.git] / src / common / docview.cpp

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index 95b9f93b460ad1244cd01235811084ab31a175c7..1127ffe74038bffe9375a235acf2c7fb98aefad5 100644 (file)
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -341,7 +341,8 @@ bool wxDocument::OnOpenDocument(const wxString& file)
         return FALSE;
     }
 #if wxUSE_STD_IOSTREAM
         return FALSE;
     }
 #if wxUSE_STD_IOSTREAM

-    if (!LoadObject(store))
+    LoadObject(store);
+    if ( !store && !store.eof() )

 #else
     int res = LoadObject(store).LastError();
     if ((res != wxSTREAM_NOERROR) &&
 #else
     int res = LoadObject(store).LastError();
     if ((res != wxSTREAM_NOERROR) &&


@@ -698,6 +699,7 @@ bool wxDocTemplate::FileMatchesTemplate(const wxString& path)
 BEGIN_EVENT_TABLE(wxDocManager, wxEvtHandler)
     EVT_MENU(wxID_OPEN, wxDocManager::OnFileOpen)
     EVT_MENU(wxID_CLOSE, wxDocManager::OnFileClose)
 BEGIN_EVENT_TABLE(wxDocManager, wxEvtHandler)
     EVT_MENU(wxID_OPEN, wxDocManager::OnFileOpen)
     EVT_MENU(wxID_CLOSE, wxDocManager::OnFileClose)

+    EVT_MENU(wxID_CLOSE_ALL, wxDocManager::OnFileCloseAll)

     EVT_MENU(wxID_REVERT, wxDocManager::OnFileRevert)
     EVT_MENU(wxID_NEW, wxDocManager::OnFileNew)
     EVT_MENU(wxID_SAVE, wxDocManager::OnFileSave)
     EVT_MENU(wxID_REVERT, wxDocManager::OnFileRevert)
     EVT_MENU(wxID_NEW, wxDocManager::OnFileNew)
     EVT_MENU(wxID_SAVE, wxDocManager::OnFileSave)


@@ -707,6 +709,7 @@ BEGIN_EVENT_TABLE(wxDocManager, wxEvtHandler)
 
     EVT_UPDATE_UI(wxID_OPEN, wxDocManager::OnUpdateFileOpen)
     EVT_UPDATE_UI(wxID_CLOSE, wxDocManager::OnUpdateFileClose)
 
     EVT_UPDATE_UI(wxID_OPEN, wxDocManager::OnUpdateFileOpen)
     EVT_UPDATE_UI(wxID_CLOSE, wxDocManager::OnUpdateFileClose)

+    EVT_UPDATE_UI(wxID_CLOSE_ALL, 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_REVERT, wxDocManager::OnUpdateFileRevert)
     EVT_UPDATE_UI(wxID_NEW, wxDocManager::OnUpdateFileNew)
     EVT_UPDATE_UI(wxID_SAVE, wxDocManager::OnUpdateFileSave)


@@ -747,7 +750,7 @@ wxDocManager::~wxDocManager()
     sm_docManager = (wxDocManager*) NULL;
 }
 
     sm_docManager = (wxDocManager*) NULL;
 }
 

-bool wxDocManager::Clear(bool force)
+bool wxDocManager::CloseDocuments(bool force)

 {
     wxNode *node = m_docs.First();
     while (node)
 {
     wxNode *node = m_docs.First();
     while (node)


@@ -771,7 +774,15 @@ bool wxDocManager::Clear(bool force)
         // delete another.
         node = next;
     }
         // delete another.
         node = next;
     }

-    node = m_templates.First();
+    return TRUE;
+}
+
+bool wxDocManager::Clear(bool force)
+{
+    if (!CloseDocuments(force))
+        return FALSE;
+
+    wxNode *node = m_templates.First();

     while (node)
     {
         wxDocTemplate *templ = (wxDocTemplate*) node->Data();
     while (node)
     {
         wxDocTemplate *templ = (wxDocTemplate*) node->Data();


@@ -806,6 +817,11 @@ void wxDocManager::OnFileClose(wxCommandEvent& WXUNUSED(event))
     }
 }
 
     }
 }
 

+void wxDocManager::OnFileCloseAll(wxCommandEvent& WXUNUSED(event))
+{
+    CloseDocuments(FALSE);
+}
+

 void wxDocManager::OnFileNew(wxCommandEvent& WXUNUSED(event))
 {
     CreateDocument(wxString(""), wxDOC_NEW);
 void wxDocManager::OnFileNew(wxCommandEvent& WXUNUSED(event))
 {
     CreateDocument(wxString(""), wxDOC_NEW);


@@ -945,7 +961,7 @@ void wxDocManager::OnUpdateFileNew(wxUpdateUIEvent& event)
 void wxDocManager::OnUpdateFileSave(wxUpdateUIEvent& event)
 {
     wxDocument *doc = GetCurrentDocument();
 void wxDocManager::OnUpdateFileSave(wxUpdateUIEvent& event)
 {
     wxDocument *doc = GetCurrentDocument();

-    event.Enable( (doc != (wxDocument*) NULL) );
+    event.Enable( doc && doc->IsModified() );

 }
 
 void wxDocManager::OnUpdateFileSaveAs(wxUpdateUIEvent& event)
 }
 
 void wxDocManager::OnUpdateFileSaveAs(wxUpdateUIEvent& event)


@@ -1176,8 +1192,9 @@ bool wxDocManager::FlushDoc(wxDocument *WXUNUSED(doc))
 
 wxDocument *wxDocManager::GetCurrentDocument() const
 {
 
 wxDocument *wxDocManager::GetCurrentDocument() const
 {

-    if (m_currentView)
-        return m_currentView->GetDocument();
+    wxView *view = GetCurrentView();
+    if (view)
+        return view->GetDocument();

     else
         return (wxDocument *) NULL;
 }
     else
         return (wxDocument *) NULL;
 }