Second try at doing Set/GetClient right

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

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index bcf1f64bb3055788a48e65a1ba1a7620d5d35e8e..d25ac43c1ef0227c76a15f2ac18059dd398d4c1c 100644 (file)
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -24,9 +24,10 @@
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"
 #endif
 

-#if USE_DOC_VIEW_ARCHITECTURE
+#if wxUSE_DOC_VIEW_ARCHITECTURE

 
 #ifndef WX_PRECOMP
 
 #ifndef WX_PRECOMP

+#include "wx/string.h"

 #include "wx/utils.h"
 #include "wx/app.h"
 #include "wx/dc.h"
 #include "wx/utils.h"
 #include "wx/app.h"
 #include "wx/dc.h"


@@ -45,20 +46,22 @@
 #include "wx/choicdlg.h"
 #include "wx/docview.h"
 #include "wx/printdlg.h"
 #include "wx/choicdlg.h"
 #include "wx/docview.h"
 #include "wx/printdlg.h"

-#include "wx/generic/prntdlgg.h"
-#include "wx/generic/printps.h"
+#include "wx/confbase.h"

 
 #include <stdio.h>
 #include <string.h>
 
 
 #include <stdio.h>
 #include <string.h>
 

-#if USE_IOSTREAMH
+#if wxUSE_IOSTREAMH

 #include <iostream.h>
 #include <iostream.h>

+#include <fstream.h>

 #else
 #include <iostream>
 #else
 #include <iostream>

+#include <fstream>
+#  ifdef _MSC_VER
+      using namespace std;
+#  endif

 #endif
 
 #endif
 

-#include "fstream.h"
-

 #if !USE_SHARED_LIBRARY
 IMPLEMENT_ABSTRACT_CLASS(wxDocument, wxEvtHandler)
 IMPLEMENT_ABSTRACT_CLASS(wxView, wxEvtHandler)
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_ABSTRACT_CLASS(wxDocument, wxEvtHandler)
 IMPLEMENT_ABSTRACT_CLASS(wxView, wxEvtHandler)


@@ -66,7 +69,7 @@ IMPLEMENT_ABSTRACT_CLASS(wxDocTemplate, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxDocManager, wxEvtHandler)
 IMPLEMENT_CLASS(wxDocChildFrame, wxFrame)
 IMPLEMENT_CLASS(wxDocParentFrame, wxFrame)
 IMPLEMENT_DYNAMIC_CLASS(wxDocManager, wxEvtHandler)
 IMPLEMENT_CLASS(wxDocChildFrame, wxFrame)
 IMPLEMENT_CLASS(wxDocParentFrame, wxFrame)

-#if USE_PRINTING_ARCHITECTURE
+#if wxUSE_PRINTING_ARCHITECTURE

 IMPLEMENT_DYNAMIC_CLASS(wxDocPrintout, wxPrintout)
 #endif
 IMPLEMENT_CLASS(wxCommand, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxDocPrintout, wxPrintout)
 #endif
 IMPLEMENT_CLASS(wxCommand, wxObject)


@@ -85,7 +88,7 @@ wxDocument::wxDocument(wxDocument *parent)
   m_documentFile="";
   m_documentTitle="";
   m_documentParent=parent;
   m_documentFile="";
   m_documentTitle="";
   m_documentParent=parent;

-  m_documentTemplate = NULL;
+  m_documentTemplate = (wxDocTemplate *) NULL;

   m_documentTypeName = "";
   m_savedYet = FALSE;
 }
   m_documentTypeName = "";
   m_savedYet = FALSE;
 }


@@ -148,7 +151,7 @@ bool wxDocument::DeleteAllViews(void)
 wxView *wxDocument::GetFirstView(void) const
 {
   if (m_documentViews.Number() == 0)
 wxView *wxDocument::GetFirstView(void) const
 {
   if (m_documentViews.Number() == 0)

-    return NULL;
+    return (wxView *) NULL;

   return (wxView *)m_documentViews.First()->Data();
 }
 
   return (wxView *)m_documentViews.First()->Data();
 }
 


@@ -289,6 +292,7 @@ bool wxDocument::OnOpenDocument(const wxString& file)
   }
   SetFilename(file, TRUE);
   Modify(FALSE);
   }
   SetFilename(file, TRUE);
   Modify(FALSE);

+  m_savedYet = TRUE;

 
   UpdateAllViews();
   
 
   UpdateAllViews();
   


@@ -461,7 +465,7 @@ wxView::wxView(wxDocument *doc)
   SetDocument(doc);
   
   m_viewTypeName = "";
   SetDocument(doc);
   
   m_viewTypeName = "";

-  m_viewFrame = NULL;
+  m_viewFrame = (wxFrame *) NULL;

 }
 
 wxView::~wxView(void)
 }
 
 wxView::~wxView(void)


@@ -532,7 +536,7 @@ bool wxView::OnClose(bool WXUNUSED(deleteWindow))
   return GetDocument() ? GetDocument()->Close() : TRUE;
 }
 
   return GetDocument() ? GetDocument()->Close() : TRUE;
 }
 

-#if USE_PRINTING_ARCHITECTURE
+#if wxUSE_PRINTING_ARCHITECTURE

 wxPrintout *wxView::OnCreatePrintout(void)
 {
   return new wxDocPrintout(this);
 wxPrintout *wxView::OnCreatePrintout(void)
 {
   return new wxDocPrintout(this);


@@ -574,7 +578,7 @@ wxDocTemplate::~wxDocTemplate(void)
 wxDocument *wxDocTemplate::CreateDocument(const wxString& path, long flags)
 {
   if (!m_docClassInfo)
 wxDocument *wxDocTemplate::CreateDocument(const wxString& path, long flags)
 {
   if (!m_docClassInfo)

-    return NULL;
+    return (wxDocument *) NULL;

   wxDocument *doc = (wxDocument *)m_docClassInfo->CreateObject();
   doc->SetFilename(path);
   doc->SetDocumentTemplate(this);
   wxDocument *doc = (wxDocument *)m_docClassInfo->CreateObject();
   doc->SetFilename(path);
   doc->SetDocumentTemplate(this);


@@ -586,14 +590,14 @@ wxDocument *wxDocTemplate::CreateDocument(const wxString& path, long flags)
   else
   {
     delete doc;
   else
   {
     delete doc;

-    return NULL;
+    return (wxDocument *) NULL;

   }
 }
 
 wxView *wxDocTemplate::CreateView(wxDocument *doc, long flags)
 {
   if (!m_viewClassInfo)
   }
 }
 
 wxView *wxDocTemplate::CreateView(wxDocument *doc, long flags)
 {
   if (!m_viewClassInfo)

-    return NULL;
+    return (wxView *) NULL;

   wxView *view = (wxView *)m_viewClassInfo->CreateObject();
   view->SetDocument(doc);
   if (view->OnCreate(doc, flags))
   wxView *view = (wxView *)m_viewClassInfo->CreateObject();
   view->SetDocument(doc);
   if (view->OnCreate(doc, flags))


@@ -603,7 +607,7 @@ wxView *wxDocTemplate::CreateView(wxDocument *doc, long flags)
   else
   {
     delete view;
   else
   {
     delete view;

-    return NULL;
+    return (wxView *) NULL;

   }
 }
 
   }
 }
 


@@ -625,9 +629,9 @@ wxDocManager::wxDocManager(long flags, bool initialize)
 {
   m_defaultDocumentNameCounter = 1;
   m_flags = flags;
 {
   m_defaultDocumentNameCounter = 1;
   m_flags = flags;

-  m_currentView = NULL;
+  m_currentView = (wxView *) NULL;

   m_maxDocsOpen = 10000;
   m_maxDocsOpen = 10000;

-  m_fileHistory = NULL;
+  m_fileHistory = (wxFileHistory *) NULL;

   if (initialize)
     Initialize();
 }
   if (initialize)
     Initialize();
 }


@@ -741,20 +745,8 @@ void wxDocManager::OnPrint(wxCommandEvent& WXUNUSED(event))
   wxPrintout *printout = view->OnCreatePrintout();
   if (printout)
   {
   wxPrintout *printout = view->OnCreatePrintout();
   if (printout)
   {

-    // TODO: trouble about this is that it pulls in the postscript
-    // code unecessarily
-#ifdef __WXMSW__
-    if ( wxTheApp->GetPrintMode() == wxPRINT_WINDOWS )
-    {
-      wxWindowsPrinter printer;
-      printer.Print(view->GetFrame(), printout, TRUE);
-    }
-    else
-#endif
-    {
-      wxPostScriptPrinter printer;
-      printer.Print(view->GetFrame(), printout, TRUE);
-    }
+    wxPrinter printer;
+    printer.Print(view->GetFrame(), printout, TRUE);

 
     delete printout;
   }
 
     delete printout;
   }


@@ -769,20 +761,9 @@ void wxDocManager::OnPrintSetup(wxCommandEvent& WXUNUSED(event))
 
   wxPrintData data;
 
 
   wxPrintData data;
 

-#ifdef __WXMSW__
-  if ( wxTheApp->GetPrintMode() == wxPRINT_WINDOWS )
-  {
-    wxPrintDialog printerDialog(parentWin, & data);
-    printerDialog.GetPrintData().SetSetupDialog(TRUE);
-    printerDialog.ShowModal();
-  }
-  else
-#endif
-  {
-    wxGenericPrintDialog printerDialog(parentWin, & data);
-    printerDialog.GetPrintData().SetSetupDialog(TRUE);
-    printerDialog.ShowModal();
-  }
+  wxPrintDialog printerDialog(parentWin, & data);
+  printerDialog.GetPrintData().SetSetupDialog(TRUE);
+  printerDialog.ShowModal();

 }
 
 void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event))
 }
 
 void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event))


@@ -795,13 +776,8 @@ void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event))
   if (printout)
   {
     // Pass two printout objects: for preview, and possible printing.
   if (printout)
   {
     // Pass two printout objects: for preview, and possible printing.

-    wxPrintPreviewBase *preview = NULL;
-#ifdef __WXMSW__
-    if ( wxTheApp->GetPrintMode() == wxPRINT_WINDOWS )
-        preview = new wxWindowsPrintPreview(printout, view->OnCreatePrintout());
-    else
-#endif
-       preview = new wxPostScriptPrintPreview(printout, view->OnCreatePrintout());
+    wxPrintPreviewBase *preview = (wxPrintPreviewBase *) NULL;
+    preview = new wxPrintPreview(printout, view->OnCreatePrintout());

 
     wxPreviewFrame *frame = new wxPreviewFrame(preview, (wxFrame *)wxTheApp->GetTopWindow(), _("Print Preview"),
                wxPoint(100, 100), wxSize(600, 650));
 
     wxPreviewFrame *frame = new wxPreviewFrame(preview, (wxFrame *)wxTheApp->GetTopWindow(), _("Print Preview"),
                wxPoint(100, 100), wxSize(600, 650));


@@ -838,7 +814,7 @@ wxView *wxDocManager::GetCurrentView(void) const
         wxDocument* doc = (wxDocument*) m_docs.First()->Data();
         return doc->GetFirstView();
     }
         wxDocument* doc = (wxDocument*) m_docs.First()->Data();
         return doc->GetFirstView();
     }

-    return NULL;
+    return (wxView *) NULL;

 }
 
 // Extend event processing to search the view's event table
 }
 
 // Extend event processing to search the view's event table


@@ -870,7 +846,7 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
   if (n == 0)
   {
     delete[] templates;
   if (n == 0)
   {
     delete[] templates;

-    return NULL;
+    return (wxDocument *) NULL;

   }
 
   // If we've reached the max number of docs, close the
   }
 
   // If we've reached the max number of docs, close the


@@ -889,7 +865,7 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
         delete doc;
     }
     else
         delete doc;
     }
     else

-      return NULL;
+      return (wxDocument *) NULL;

   }
   
   // New document: user chooses a template, unless there's only one.
   }
   
   // New document: user chooses a template, unless there's only one.


@@ -923,11 +899,11 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
       return newDoc;
     }
     else
       return newDoc;
     }
     else

-      return NULL;
+      return (wxDocument *) NULL;

   }
 
   // Existing document
   }
 
   // Existing document

-  wxDocTemplate *temp = NULL;
+  wxDocTemplate *temp = (wxDocTemplate *) NULL;

 
   wxString path2("");
   if (path != "")
 
   wxString path2("");
   if (path != "")


@@ -950,14 +926,14 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
       if (!newDoc->OnOpenDocument(path2))
       {
         delete newDoc;
       if (!newDoc->OnOpenDocument(path2))
       {
         delete newDoc;

-        return NULL;
+        return (wxDocument *) NULL;

       }
       AddFileToHistory(path2);
     }
     return newDoc;
   }
   else
       }
       AddFileToHistory(path2);
     }
     return newDoc;
   }
   else

-    return NULL;
+    return (wxDocument *) NULL;

 }
 
 wxView *wxDocManager::CreateView(wxDocument *doc, long flags)
 }
 
 wxView *wxDocManager::CreateView(wxDocument *doc, long flags)


@@ -980,7 +956,7 @@ wxView *wxDocManager::CreateView(wxDocument *doc, long flags)
   if (n == 0)
   {
     delete[] templates;
   if (n == 0)
   {
     delete[] templates;

-    return NULL;
+    return (wxView *) NULL;

   }
   if (n == 1)
   {
   }
   if (n == 1)
   {


@@ -1002,7 +978,7 @@ wxView *wxDocManager::CreateView(wxDocument *doc, long flags)
     return view;
   }
   else
     return view;
   }
   else

-    return NULL;
+    return (wxView *) NULL;

 }
 
 // Not yet implemented
 }
 
 // Not yet implemented


@@ -1021,7 +997,7 @@ wxDocument *wxDocManager::GetCurrentDocument(void) const
   if (m_currentView)
     return m_currentView->GetDocument();
   else
   if (m_currentView)
     return m_currentView->GetDocument();
   else

-    return NULL;
+    return (wxDocument *) NULL;

 }
 
 // Make a default document name
 }
 
 // Make a default document name


@@ -1037,7 +1013,7 @@ bool wxDocManager::MakeDefaultName(wxString& name)
 // Not yet implemented
 wxDocTemplate *wxDocManager::MatchTemplate(const wxString& WXUNUSED(path))
 {
 // Not yet implemented
 wxDocTemplate *wxDocManager::MatchTemplate(const wxString& WXUNUSED(path))
 {

-  return NULL;
+  return (wxDocTemplate *) NULL;

 }
 
 // File history management
 }
 
 // File history management


@@ -1058,19 +1034,37 @@ wxString wxDocManager::GetHistoryFile(int i) const
 void wxDocManager::FileHistoryUseMenu(wxMenu *menu)
 {
   if (m_fileHistory)
 void wxDocManager::FileHistoryUseMenu(wxMenu *menu)
 {
   if (m_fileHistory)

-    m_fileHistory->FileHistoryUseMenu(menu);
+    m_fileHistory->UseMenu(menu);

 }
 
 }
 

-void wxDocManager::FileHistoryLoad(const wxString& resourceFile, const wxString& section)
+void wxDocManager::FileHistoryRemoveMenu(wxMenu *menu)

 {
   if (m_fileHistory)
 {
   if (m_fileHistory)

-    m_fileHistory->FileHistoryLoad(resourceFile, section);
+    m_fileHistory->RemoveMenu(menu);

 }
 
 }
 

-void wxDocManager::FileHistorySave(const wxString& resourceFile, const wxString& section)
+void wxDocManager::FileHistoryLoad(wxConfigBase& config)

 {
   if (m_fileHistory)
 {
   if (m_fileHistory)

-    m_fileHistory->FileHistorySave(resourceFile, section);
+    m_fileHistory->Load(config);
+}
+
+void wxDocManager::FileHistorySave(wxConfigBase& config)
+{
+  if (m_fileHistory)
+    m_fileHistory->Save(config);
+}
+
+void wxDocManager::FileHistoryAddFilesToMenu(wxMenu* menu)
+{
+  if (m_fileHistory)
+    m_fileHistory->AddFilesToMenu(menu);
+}
+
+void wxDocManager::FileHistoryAddFilesToMenu()
+{
+  if (m_fileHistory)
+    m_fileHistory->AddFilesToMenu();

 }
 
 int wxDocManager::GetNoHistoryFiles(void) const
 }
 
 int wxDocManager::GetNoHistoryFiles(void) const


@@ -1100,9 +1094,9 @@ static char *FindExtension(char *path)
       return ext;
     }
     else
       return ext;
     }
     else

-      return NULL;
+      return (char *) NULL;

   }
   }

-  else return NULL;
+  else return (char *) NULL;

 }
 
 
 }
 
 


@@ -1112,8 +1106,8 @@ wxDocTemplate *wxDocManager::FindTemplateForPath(const wxString& path)
 {
   char *theExt = FindExtension((char *)(const char *)path);
   if (!theExt)
 {
   char *theExt = FindExtension((char *)(const char *)path);
   if (!theExt)

-    return NULL;
-  wxDocTemplate *theTemplate = NULL;
+    return (wxDocTemplate *) NULL;
+  wxDocTemplate *theTemplate = (wxDocTemplate *) NULL;

 
   if (m_templates.Number() == 1)
     return (wxDocTemplate *)m_templates.First()->Data();
 
   if (m_templates.Number() == 1)
     return (wxDocTemplate *)m_templates.First()->Data();


@@ -1161,6 +1155,9 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
   if (len > 0)
     // Omit final "|"
     descrBuf[len-1] = 0;
   if (len > 0)
     // Omit final "|"
     descrBuf[len-1] = 0;

+#else
+  char* descrBuf = copystring("*.*");
+#endif

 
   char *pathTmp = wxFileSelector(_("Select a file"), "", "", "", descrBuf, 0, wxTheApp->GetTopWindow());
   delete[] descrBuf;
 
   char *pathTmp = wxFileSelector(_("Select a file"), "", "", "", descrBuf, 0, wxTheApp->GetTopWindow());
   delete[] descrBuf;


@@ -1169,7 +1166,7 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
     path = pathTmp;
     char *theExt = FindExtension((char *)(const char *)path);
     if (!theExt)
     path = pathTmp;
     char *theExt = FindExtension((char *)(const char *)path);
     if (!theExt)

-      return NULL;
+      return (wxDocTemplate *) NULL;

 
     // This is dodgy in that we're selecting the template on the
     // basis of the file extension, which may not be a standard
 
     // This is dodgy in that we're selecting the template on the
     // basis of the file extension, which may not be a standard


@@ -1181,15 +1178,15 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
   else
   {
     path = "";
   else
   {
     path = "";

-    return NULL;
+    return (wxDocTemplate *) NULL;

   }
   }

-#else
+#if 0

   // In all other windowing systems, until we have more advanced
   // file selectors, we must select the document type (template) first, and
   // _then_ pop up the file selector.
   wxDocTemplate *temp = SelectDocumentType(templates, noTemplates);
   if (!temp)
   // In all other windowing systems, until we have more advanced
   // file selectors, we must select the document type (template) first, and
   // _then_ pop up the file selector.
   wxDocTemplate *temp = SelectDocumentType(templates, noTemplates);
   if (!temp)

-    return NULL;
+    return (wxDocTemplate *) NULL;

 
   char *pathTmp = wxFileSelector(_("Select a file"), "", "",
      temp->GetDefaultExtension(),
 
   char *pathTmp = wxFileSelector(_("Select a file"), "", "",
      temp->GetDefaultExtension(),


@@ -1202,7 +1199,7 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
     return temp;
   }
   else
     return temp;
   }
   else

-    return NULL;
+    return (wxDocTemplate *) NULL;

 #endif
 }
 
 #endif
 }
 


@@ -1226,7 +1223,7 @@ wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
   {
     delete[] strings;
     delete[] data;
   {
     delete[] strings;
     delete[] data;

-    return NULL;
+    return (wxDocTemplate *) NULL;

   }
   else if (n == 1)
   {
   }
   else if (n == 1)
   {


@@ -1309,7 +1306,7 @@ void wxDocManager::ActivateView(wxView *view, bool activate, bool WXUNUSED(delet
     if (activate)
       m_currentView = view;
     else
     if (activate)
       m_currentView = view;
     else

-      m_currentView = NULL;
+      m_currentView = (wxView *) NULL;

   }
 }
 
   }
 }
 


@@ -1319,6 +1316,7 @@ void wxDocManager::ActivateView(wxView *view, bool activate, bool WXUNUSED(delet
 
 BEGIN_EVENT_TABLE(wxDocChildFrame, wxFrame)
     EVT_ACTIVATE(wxDocChildFrame::OnActivate)
 
 BEGIN_EVENT_TABLE(wxDocChildFrame, wxFrame)
     EVT_ACTIVATE(wxDocChildFrame::OnActivate)

+    EVT_CLOSE(wxDocChildFrame::OnCloseWindow)

 END_EVENT_TABLE()
 
 wxDocChildFrame::wxDocChildFrame(wxDocument *doc, wxView *view, wxFrame *frame, wxWindowID id, const wxString& title,
 END_EVENT_TABLE()
 
 wxDocChildFrame::wxDocChildFrame(wxDocument *doc, wxView *view, wxFrame *frame, wxWindowID id, const wxString& title,


@@ -1361,24 +1359,30 @@ void wxDocChildFrame::OnActivate(wxActivateEvent& event)
     m_childView->Activate(event.GetActive());
 }
 
     m_childView->Activate(event.GetActive());
 }
 

-bool wxDocChildFrame::OnClose(void)
+void wxDocChildFrame::OnCloseWindow(wxCloseEvent& event)

 {
 {

-  // Close view but don't delete the frame while doing so!
-  // ...since it will be deleted by wxWindows if we return TRUE.

   if (m_childView)
   {
   if (m_childView)
   {

-    bool ans = m_childView->Close(FALSE); // FALSE means don't delete associated window
+    bool ans = FALSE;
+    if (!event.CanVeto())
+      ans = TRUE; // Must delete.
+    else
+      ans = m_childView->Close(FALSE); // FALSE means don't delete associated window
+

     if (ans)
     {
       m_childView->Activate(FALSE);
       delete m_childView;
     if (ans)
     {
       m_childView->Activate(FALSE);
       delete m_childView;

-      m_childView = NULL;
-      m_childDocument = NULL;
+      m_childView = (wxView *) NULL;
+      m_childDocument = (wxDocument *) NULL;
+
+      this->Destroy();

     }
     }

-    
-    return ans;
+    else
+      event.Veto();

   }
   }

-  else return TRUE;
+  else
+    event.Veto();

 }
 
 /*
 }
 
 /*


@@ -1388,6 +1392,7 @@ bool wxDocChildFrame::OnClose(void)
 BEGIN_EVENT_TABLE(wxDocParentFrame, wxFrame)
     EVT_MENU(wxID_EXIT, wxDocParentFrame::OnExit)
     EVT_MENU_RANGE(wxID_FILE1, wxID_FILE9, wxDocParentFrame::OnMRUFile)
 BEGIN_EVENT_TABLE(wxDocParentFrame, wxFrame)
     EVT_MENU(wxID_EXIT, wxDocParentFrame::OnExit)
     EVT_MENU_RANGE(wxID_FILE1, wxID_FILE9, wxDocParentFrame::OnMRUFile)

+    EVT_CLOSE(wxDocParentFrame::OnCloseWindow)

 END_EVENT_TABLE()
 
 wxDocParentFrame::wxDocParentFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const wxString& title,
 END_EVENT_TABLE()
 
 wxDocParentFrame::wxDocParentFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const wxString& title,


@@ -1421,12 +1426,17 @@ bool wxDocParentFrame::ProcessEvent(wxEvent& event)
 
 // Define the behaviour for the frame closing
 // - must delete all frames except for the main one.
 
 // Define the behaviour for the frame closing
 // - must delete all frames except for the main one.

-bool wxDocParentFrame::OnClose(void)
+void wxDocParentFrame::OnCloseWindow(wxCloseEvent& event)

 {
 {

-  return m_docManager->Clear(FALSE);
+  if (m_docManager->Clear(!event.CanVeto()))
+  {
+    this->Destroy();
+  }
+  else
+    event.Veto();

 }
 
 }
 

-#if USE_PRINTING_ARCHITECTURE
+#if wxUSE_PRINTING_ARCHITECTURE

 
 wxDocPrintout::wxDocPrintout(wxView *view, const wxString& title):
   wxPrintout(WXSTRINGCAST title)
 
 wxDocPrintout::wxDocPrintout(wxView *view, const wxString& title):
   wxPrintout(WXSTRINGCAST title)


@@ -1511,8 +1521,8 @@ wxCommand::~wxCommand(void)
 wxCommandProcessor::wxCommandProcessor(int maxCommands)
 {
   m_maxNoCommands = maxCommands;
 wxCommandProcessor::wxCommandProcessor(int maxCommands)
 {
   m_maxNoCommands = maxCommands;

-  m_currentCommand = NULL;
-  m_commandEditMenu = NULL;
+  m_currentCommand = (wxNode *) NULL;
+  m_commandEditMenu = (wxMenu *) NULL;

 }
 
 wxCommandProcessor::~wxCommandProcessor(void)
 }
 
 wxCommandProcessor::~wxCommandProcessor(void)


@@ -1580,8 +1590,8 @@ bool wxCommandProcessor::Undo(void)
 
 bool wxCommandProcessor::Redo(void)
 {
 
 bool wxCommandProcessor::Redo(void)
 {

-  wxCommand *redoCommand = NULL;
-  wxNode *redoNode = NULL;
+  wxCommand *redoCommand = (wxCommand *) NULL;
+  wxNode *redoNode = (wxNode *) NULL;

   if (m_currentCommand && m_currentCommand->Next())
   {
     redoCommand = (wxCommand *)m_currentCommand->Next()->Data();
   if (m_currentCommand && m_currentCommand->Next())
   {
     redoCommand = (wxCommand *)m_currentCommand->Next()->Data();


@@ -1609,13 +1619,27 @@ bool wxCommandProcessor::Redo(void)
   return FALSE;
 }
 
   return FALSE;
 }
 

-bool wxCommandProcessor::CanUndo(void)
+bool wxCommandProcessor::CanUndo(void) const

 {
   if (m_currentCommand)
     return ((wxCommand *)m_currentCommand->Data())->CanUndo();
   return FALSE;
 }
 
 {
   if (m_currentCommand)
     return ((wxCommand *)m_currentCommand->Data())->CanUndo();
   return FALSE;
 }
 

+bool wxCommandProcessor::CanRedo(void) const
+{
+    if ((m_currentCommand != (wxNode*) NULL) && (m_currentCommand->Next() == (wxNode*) NULL))
+        return FALSE;
+
+    if ((m_currentCommand != (wxNode*) NULL) && (m_currentCommand->Next() != (wxNode*) NULL))
+        return TRUE;
+
+    if ((m_currentCommand == (wxNode*) NULL) && (m_commands.Number() > 0))
+        return TRUE;
+
+    return FALSE;
+}
+

 void wxCommandProcessor::Initialize(void)
 {
   m_currentCommand = m_commands.Last();
 void wxCommandProcessor::Initialize(void)
 {
   m_currentCommand = m_commands.Last();


@@ -1692,7 +1716,7 @@ void wxCommandProcessor::ClearCommands(void)
     delete node;
     node = m_commands.First();
   }
     delete node;
     node = m_commands.First();
   }

-  m_currentCommand = NULL;
+  m_currentCommand = (wxNode *) NULL;

 }
 
 
 }
 
 


@@ -1703,7 +1727,6 @@ void wxCommandProcessor::ClearCommands(void)
 wxFileHistory::wxFileHistory(int maxFiles)
 {
   m_fileMaxFiles = maxFiles;
 wxFileHistory::wxFileHistory(int maxFiles)
 {
   m_fileMaxFiles = maxFiles;

-  m_fileMenu = NULL;

   m_fileHistoryN = 0;
   m_fileHistory = new char *[m_fileMaxFiles];
 }
   m_fileHistoryN = 0;
   m_fileHistory = new char *[m_fileMaxFiles];
 }


@@ -1719,18 +1742,14 @@ wxFileHistory::~wxFileHistory(void)
 // File history management
 void wxFileHistory::AddFileToHistory(const wxString& file)
 {
 // File history management
 void wxFileHistory::AddFileToHistory(const wxString& file)
 {

-  if (!m_fileMenu)
-    return;
-    

   int i;
   int i;

-

   // Check we don't already have this file
   for (i = 0; i < m_fileHistoryN; 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)
-      return;
+      if (m_fileHistory[i] && wxString(m_fileHistory[i]) == file)
+          return;

   }
   }

-  
+

   // Add to the project file history:
   // Move existing files (if any) down so we can insert file at beginning.
   
   // Add to the project file history:
   // Move existing files (if any) down so we can insert file at beginning.
   


@@ -1738,13 +1757,19 @@ void wxFileHistory::AddFileToHistory(const wxString& file)
   if (m_fileHistoryN == m_fileMaxFiles)
   {
     delete[] m_fileHistory[m_fileMaxFiles-1];
   if (m_fileHistoryN == m_fileMaxFiles)
   {
     delete[] m_fileHistory[m_fileMaxFiles-1];

-    m_fileHistory[m_fileMaxFiles-1] = NULL;
+    m_fileHistory[m_fileMaxFiles-1] = (char *) NULL;

   }
   if (m_fileHistoryN < m_fileMaxFiles)
   {
   }
   if (m_fileHistoryN < m_fileMaxFiles)
   {

-    if (m_fileHistoryN == 0)
-      m_fileMenu->AppendSeparator();
-    m_fileMenu->Append(wxID_FILE1+m_fileHistoryN, _("[EMPTY]"));
+    wxNode* node = m_fileMenus.First();
+    while (node)
+    {
+        wxMenu* menu = (wxMenu*) node->Data();
+        if (m_fileHistoryN == 0)
+            menu->AppendSeparator();
+        menu->Append(wxID_FILE1+m_fileHistoryN, _("[EMPTY]"));
+        node = node->Next();
+    }

     m_fileHistoryN ++;
   }
   // Shuffle filenames down
     m_fileHistoryN ++;
   }
   // Shuffle filenames down


@@ -1759,7 +1784,13 @@ void wxFileHistory::AddFileToHistory(const wxString& file)
     {
       char buf[400];
       sprintf(buf, "&%d %s", i+1, m_fileHistory[i]);
     {
       char buf[400];
       sprintf(buf, "&%d %s", i+1, m_fileHistory[i]);

-      m_fileMenu->SetLabel(wxID_FILE1+i, buf);
+      wxNode* node = m_fileMenus.First();
+      while (node)
+      {
+        wxMenu* menu = (wxMenu*) node->Data();
+        menu->SetLabel(wxID_FILE1+i, buf);
+        node = node->Next();
+      }

     }
 }
 
     }
 }
 


@@ -1771,40 +1802,84 @@ wxString wxFileHistory::GetHistoryFile(int i) const
     return wxString("");
 }
 
     return wxString("");
 }
 

-void wxFileHistory::FileHistoryUseMenu(wxMenu *menu)
+void wxFileHistory::UseMenu(wxMenu *menu)
+{
+  if (!m_fileMenus.Member(menu))
+    m_fileMenus.Append(menu);
+}
+
+void wxFileHistory::RemoveMenu(wxMenu *menu)

 {
 {

-  m_fileMenu = menu;
+  m_fileMenus.DeleteObject(menu);

 }
 
 }
 

-void wxFileHistory::FileHistoryLoad(const wxString& resourceFile, const wxString& section)
+void wxFileHistory::Load(wxConfigBase& config)

 {
 {

-#if USE_RESOURCES

   m_fileHistoryN = 0;
   char buf[400];
   sprintf(buf, "file%d", m_fileHistoryN+1);
   m_fileHistoryN = 0;
   char buf[400];
   sprintf(buf, "file%d", m_fileHistoryN+1);

-  char *historyFile = NULL;
-  while ((m_fileHistoryN <= m_fileMaxFiles) && wxGetResource(section, buf, &historyFile, resourceFile) && historyFile)
+  wxString historyFile("");
+  while ((m_fileHistoryN <= m_fileMaxFiles) && config.Read(buf, &historyFile) && (historyFile != ""))

   {
   {

-    // wxGetResource allocates memory so this is o.k.
-    m_fileHistory[m_fileHistoryN] = historyFile;
+    m_fileHistory[m_fileHistoryN] = copystring((const char*) historyFile);

     m_fileHistoryN ++;
     sprintf(buf, "file%d", m_fileHistoryN+1);
     m_fileHistoryN ++;
     sprintf(buf, "file%d", m_fileHistoryN+1);

-    historyFile = NULL;
+    historyFile = "";

   }
   }

-#endif
+  AddFilesToMenu();

 }
 
 }
 

-void wxFileHistory::FileHistorySave(const wxString& resourceFile, const wxString& section)
+void wxFileHistory::Save(wxConfigBase& config)

 {
 {

-#if USE_RESOURCES
-  char buf[400];

   int i;
   for (i = 0; i < m_fileHistoryN; i++)
   {
   int i;
   for (i = 0; i < m_fileHistoryN; i++)
   {

-    sprintf(buf, "file%d", i+1);
-    wxWriteResource(section, buf, m_fileHistory[i], resourceFile);
+    wxString buf;
+    buf.Printf("file%d", i+1);
+    config.Write(buf, wxString(m_fileHistory[i]));

   }
   }

-#endif
+}
+
+void wxFileHistory::AddFilesToMenu()
+{
+    if (m_fileHistoryN > 0)
+    {
+        wxNode* node = m_fileMenus.First();
+        while (node)
+        {
+            wxMenu* menu = (wxMenu*) node->Data();
+            menu->AppendSeparator();
+            int i;
+            for (i = 0; i < m_fileHistoryN; i++)
+            {
+                if (m_fileHistory[i])
+                {
+                    wxString buf;
+                    buf.Printf("&%d %s", i+1, m_fileHistory[i]);
+                    menu->Append(wxID_FILE1+i, buf);
+                }
+            }
+            node = node->Next();
+        }
+    }
+}
+
+void wxFileHistory::AddFilesToMenu(wxMenu* menu)
+{
+    if (m_fileHistoryN > 0)
+    {
+        menu->AppendSeparator();
+        int i;
+        for (i = 0; i < m_fileHistoryN; i++)
+        {
+            if (m_fileHistory[i])
+            {
+                wxString buf;
+                buf.Printf("&%d %s", i+1, m_fileHistory[i]);
+                menu->Append(wxID_FILE1+i, buf);
+            }
+        }
+    }

 }
 
 #if 0
 }
 
 #if 0


@@ -1863,4 +1938,4 @@ bool wxTransferStreamToFile(istream& stream, const wxString& filename)
 }
 
 #endif
 }
 
 #endif

-  // End USE_DOC_VIEW_ARCHITECTURE
+  // End wxUSE_DOC_VIEW_ARCHITECTURE