Notebook, Listbox, and Checklst updates

[wxWidgets.git] / include / wx / docview.h

diff --git a/include/wx/docview.h b/include/wx/docview.h
index 994487059a5fd0a17fcb102f0c12b3b996fcd70a..93e968d3348b1a9fda824c8bd18fe3944f49e003 100644 (file)
--- a/include/wx/docview.h
+++ b/include/wx/docview.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DOCH__
 #define _WX_DOCH__
 
 #ifndef _WX_DOCH__
 #define _WX_DOCH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma interface "docview.h"
 #endif
 
     #pragma interface "docview.h"
 #endif
 


@@ -20,6 +20,7 @@
 #include "wx/list.h"
 #include "wx/cmndata.h"
 #include "wx/string.h"
 #include "wx/list.h"
 #include "wx/cmndata.h"
 #include "wx/string.h"

+#include "wx/frame.h"

 
 #if wxUSE_PRINTING_ARCHITECTURE
     #include "wx/print.h"
 
 #if wxUSE_PRINTING_ARCHITECTURE
     #include "wx/print.h"


@@ -95,11 +96,6 @@ public:
     virtual wxInputStream& LoadObject(wxInputStream& stream);
 #endif
 
     virtual wxInputStream& LoadObject(wxInputStream& stream);
 #endif
 

-#if wxUSE_SERIAL
-    // need this to keep from hiding the virtual from wxObject
-    virtual void LoadObject(wxObjectInputStream& stream) { wxObject::LoadObject(stream); };
-#endif
-

     // Called by wxWindows
     virtual bool OnSaveDocument(const wxString& filename);
     virtual bool OnOpenDocument(const wxString& filename);
     // Called by wxWindows
     virtual bool OnSaveDocument(const wxString& filename);
     virtual bool OnOpenDocument(const wxString& filename);


@@ -137,6 +133,7 @@ public:
     wxView *GetFirstView() const;
 
     virtual void UpdateAllViews(wxView *sender = (wxView *) NULL, wxObject *hint = (wxObject *) NULL);
     wxView *GetFirstView() const;
 
     virtual void UpdateAllViews(wxView *sender = (wxView *) NULL, wxObject *hint = (wxObject *) NULL);

+    virtual void NotifyClosing();

 
     // Remove all views (because we're closing the document)
     virtual bool DeleteAllViews();
 
     // Remove all views (because we're closing the document)
     virtual bool DeleteAllViews();


@@ -175,18 +172,19 @@ public:
     ~wxView();
 
     wxDocument *GetDocument() const { return m_viewDocument; }
     ~wxView();
 
     wxDocument *GetDocument() const { return m_viewDocument; }

-    void SetDocument(wxDocument *doc);
+    virtual void SetDocument(wxDocument *doc);

 
     wxString GetViewName() const { return m_viewTypeName; }
     void SetViewName(const wxString& name) { m_viewTypeName = name; };
 
 
     wxString GetViewName() const { return m_viewTypeName; }
     void SetViewName(const wxString& name) { m_viewTypeName = name; };
 

-    wxFrame *GetFrame() const { return m_viewFrame ; }
-    void SetFrame(wxFrame *frame) { m_viewFrame = frame; }
+    wxWindow *GetFrame() const { return m_viewFrame ; }
+    void SetFrame(wxWindow *frame) { m_viewFrame = frame; }

 
     virtual void OnActivateView(bool activate, wxView *activeView, wxView *deactiveView);
     virtual void OnDraw(wxDC *dc) = 0;
     virtual void OnPrint(wxDC *dc, wxObject *info);
     virtual void OnUpdate(wxView *sender, wxObject *hint = (wxObject *) NULL);
 
     virtual void OnActivateView(bool activate, wxView *activeView, wxView *deactiveView);
     virtual void OnDraw(wxDC *dc) = 0;
     virtual void OnPrint(wxDC *dc, wxObject *info);
     virtual void OnUpdate(wxView *sender, wxObject *hint = (wxObject *) NULL);

+    virtual void OnClosingDocument() {};

     virtual void OnChangeFilename();
 
     // Called by framework if created automatically by the default document
     virtual void OnChangeFilename();
 
     // Called by framework if created automatically by the default document


@@ -223,7 +221,7 @@ public:
 protected:
     wxDocument*       m_viewDocument;
     wxString          m_viewTypeName;
 protected:
     wxDocument*       m_viewDocument;
     wxString          m_viewTypeName;

-    wxFrame*          m_viewFrame;
+    wxWindow*         m_viewFrame;

 };
 
 // Represents user interface (and other) properties of documents and views
 };
 
 // Represents user interface (and other) properties of documents and views


@@ -304,6 +302,7 @@ public:
 
     // Handlers for common user commands
     void OnFileClose(wxCommandEvent& event);
 
     // Handlers for common user commands
     void OnFileClose(wxCommandEvent& event);

+    void OnFileCloseAll(wxCommandEvent& event);

     void OnFileNew(wxCommandEvent& event);
     void OnFileOpen(wxCommandEvent& event);
     void OnFileRevert(wxCommandEvent& event);
     void OnFileNew(wxCommandEvent& event);
     void OnFileOpen(wxCommandEvent& event);
     void OnFileRevert(wxCommandEvent& event);


@@ -364,6 +363,9 @@ public:
     void AddDocument(wxDocument *doc);
     void RemoveDocument(wxDocument *doc);
 
     void AddDocument(wxDocument *doc);
     void RemoveDocument(wxDocument *doc);
 

+    // closes all currently open documents
+    bool CloseDocuments(bool force = TRUE);
+

     // Clear remaining documents and templates
     bool Clear(bool force = TRUE);
 
     // Clear remaining documents and templates
     bool Clear(bool force = TRUE);