X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3996031094e28a6936ca1df2d289c9d3baecb27d..c4ad618c2f90bee9b5dafd83c96ea2b4e04d3c87:/samples/docview/docview.cpp?ds=sidebyside

diff --git a/samples/docview/docview.cpp b/samples/docview/docview.cpp
index d8f9005801..b8d95575ac 100644
--- a/samples/docview/docview.cpp
+++ b/samples/docview/docview.cpp
@@ -5,16 +5,12 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-// #pragma implementation "docview.h"
-#endif
-
 /*
-* Purpose:  Document/view architecture demo for wxWindows class library
+* Purpose:  Document/view architecture demo for wxWidgets class library
 *           Run with no arguments for multiple top-level windows, -single
 *           for a single window.
 */
@@ -40,12 +36,15 @@
 #include "docview.h"
 #include "doc.h"
 #include "view.h"
+#ifdef __WXMAC__
+#include "wx/filename.h"
+#endif
 
 MyFrame *frame = (MyFrame *) NULL;
 
 // In single window mode, don't have any child windows; use
 // main window.
-bool singleWindowMode = FALSE;
+bool singleWindowMode = false;
 
 IMPLEMENT_APP(MyApp)
 
@@ -64,7 +63,7 @@ bool MyApp::OnInit(void)
     {
         if (wxStrcmp(argv[1], _T("-single")) == 0)
         {
-            singleWindowMode = TRUE;
+            singleWindowMode = true;
         }
     }
     
@@ -74,6 +73,9 @@ bool MyApp::OnInit(void)
     //// Create a template relating drawing documents to their views
     (void) new wxDocTemplate(m_docManager, _T("Drawing"), _T("*.drw"), _T(""), _T("drw"), _T("Drawing Doc"), _T("Drawing View"),
         CLASSINFO(DrawingDocument), CLASSINFO(DrawingView));
+#ifdef __WXMAC__
+    wxFileName::MacRegisterDefaultTypeAndCreator( wxT("drw") , 'WXMB' , 'WXMA' ) ;
+#endif
     
     if (singleWindowMode)
     {
@@ -83,12 +85,17 @@ bool MyApp::OnInit(void)
         m_docManager->SetMaxDocsOpen(1);
     }
     else
+    {
         //// Create a template relating text documents to their views
-        (void) new wxDocTemplate(m_docManager, _T("Text"), _T("*.txt"), _T(""), _T("txt"), _T("Text Doc"), _T("Text View"),
+        (void) new wxDocTemplate(m_docManager, _T("Text"), _T("*.txt;*.text"), _T(""), _T("txt;text"), _T("Text Doc"), _T("Text View"),
         CLASSINFO(TextEditDocument), CLASSINFO(TextEditView));
+#ifdef __WXMAC__
+        wxFileName::MacRegisterDefaultTypeAndCreator( wxT("txt") , 'TEXT' , 'WXMA' ) ;
+#endif
+    }
     
     //// Create the main frame window
-    frame = new MyFrame(m_docManager, (wxFrame *) NULL, -1, _T("DocView Demo"), wxPoint(0, 0), wxSize(500, 400), wxDEFAULT_FRAME_STYLE);
+    frame = new MyFrame(m_docManager, (wxFrame *) NULL, wxID_ANY, _T("DocView Demo"), wxPoint(0, 0), wxSize(500, 400), wxDEFAULT_FRAME_STYLE);
     
     //// Give it an icon (this is ignored in MDI mode: uses resources)
 #ifdef __WXMSW__
@@ -144,10 +151,10 @@ bool MyApp::OnInit(void)
     frame->SetMenuBar(menu_bar);
     
     frame->Centre(wxBOTH);
-    frame->Show(TRUE);
+    frame->Show(true);
     
     SetTopWindow(frame);
-    return TRUE;
+    return true;
 }
 
 int MyApp::OnExit(void)
@@ -165,7 +172,7 @@ int MyApp::OnExit(void)
 wxFrame *MyApp::CreateChildFrame(wxDocument *doc, wxView *view, bool isCanvas)
 {
     //// Make a child frame
-    wxDocChildFrame *subframe = new wxDocChildFrame(doc, view, GetMainFrame(), -1, _T("Child Frame"),
+    wxDocChildFrame *subframe = new wxDocChildFrame(doc, view, GetMainFrame(), wxID_ANY, _T("Child Frame"),
         wxPoint(10, 10), wxSize(300, 300), wxDEFAULT_FRAME_STYLE);
     
 #ifdef __WXMSW__
@@ -258,7 +265,7 @@ MyCanvas *MyFrame::CreateCanvas(wxView *view, wxFrame *parent)
     // Give it scrollbars
     canvas->SetScrollbars(20, 20, 50, 50);
     canvas->SetBackgroundColour(*wxWHITE);
-    canvas->Clear();
+    canvas->ClearBackground();
     
     return canvas;
 }