apply complete transforms (scroll window PrepareDC was not functioning properly)

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

diff --git a/include/wx/docmdi.h b/include/wx/docmdi.h
index 973f16f5fb404cb711c819e28a7a2dd036e1b721..e94973701c96514981db222933002d37ef691e3a 100644 (file)
--- a/include/wx/docmdi.h
+++ b/include/wx/docmdi.h
@@ -5,17 +5,13 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c)
-// Licence:    wxWindows licence
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DOCMDI_H_
 #define _WX_DOCMDI_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DOCMDI_H_
 #define _WX_DOCMDI_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "docmdi.h"
-#endif
-

 #include "wx/defs.h"
 
 #if wxUSE_MDI_ARCHITECTURE
 #include "wx/defs.h"
 
 #if wxUSE_MDI_ARCHITECTURE


@@ -30,10 +26,15 @@
 class WXDLLEXPORT wxDocMDIParentFrame: public wxMDIParentFrame
 {
 public:
 class WXDLLEXPORT wxDocMDIParentFrame: public wxMDIParentFrame
 {
 public:

+    wxDocMDIParentFrame();

     wxDocMDIParentFrame(wxDocManager *manager, wxFrame *parent, wxWindowID id,
         const wxString& title, const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxT("frame"));
 
     wxDocMDIParentFrame(wxDocManager *manager, wxFrame *parent, wxWindowID id,
         const wxString& title, const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxT("frame"));
 

+    bool Create(wxDocManager *manager, wxFrame *parent, wxWindowID id,
+        const wxString& title, const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxT("frame"));
+

     // Extend event processing to search the document manager's event table
     virtual bool ProcessEvent(wxEvent& event);
 
     // Extend event processing to search the document manager's event table
     virtual bool ProcessEvent(wxEvent& event);
 


@@ -44,6 +45,7 @@ public:
     void OnCloseWindow(wxCloseEvent& event);
 
 protected:
     void OnCloseWindow(wxCloseEvent& event);
 
 protected:

+    void Init();

     wxDocManager *m_docManager;
 
 private:
     wxDocManager *m_docManager;
 
 private:


@@ -63,7 +65,7 @@ public:
     wxDocMDIChildFrame(wxDocument *doc, wxView *view, wxMDIParentFrame *frame, wxWindowID id,
         const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
         long type = wxDEFAULT_FRAME_STYLE, const wxString& name = wxT("frame"));
     wxDocMDIChildFrame(wxDocument *doc, wxView *view, wxMDIParentFrame *frame, wxWindowID id,
         const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
         long type = wxDEFAULT_FRAME_STYLE, const wxString& name = wxT("frame"));

-    ~wxDocMDIChildFrame();
+    virtual ~wxDocMDIChildFrame();

 
     bool Create(wxDocument *doc,
                 wxView *view,
 
     bool Create(wxDocument *doc,
                 wxView *view,


@@ -86,7 +88,7 @@ public:
     inline void SetDocument(wxDocument *doc) { m_childDocument = doc; }
     inline void SetView(wxView *view) { m_childView = view; }
     bool Destroy() { m_childView = (wxView *)NULL; return wxMDIChildFrame::Destroy(); }
     inline void SetDocument(wxDocument *doc) { m_childDocument = doc; }
     inline void SetView(wxView *view) { m_childView = view; }
     bool Destroy() { m_childView = (wxView *)NULL; return wxMDIChildFrame::Destroy(); }

-    
+

 protected:
     void Init();
     wxDocument*       m_childDocument;
 protected:
     void Init();
     wxDocument*       m_childDocument;