wxChar -> char

[wxWidgets.git] / samples / docview / docview.cpp

diff --git a/samples/docview/docview.cpp b/samples/docview/docview.cpp
index c939e577a1192759465c5ad4f7d7f6f15654bd14..3a2f1a5582282a3434c928b4c0cb2eadcbcb660c 100644 (file)
--- a/samples/docview/docview.cpp
+++ b/samples/docview/docview.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-// #pragma implementation "docview.h"
-#endif
-
 /*
 * Purpose:  Document/view architecture demo for wxWidgets class library
 *           Run with no arguments for multiple top-level windows, -single
@@ -59,6 +55,9 @@ MyApp::MyApp(void)
 
 bool MyApp::OnInit(void)
 {
+    if ( !wxApp::OnInit() )
+        return false;
+
     //// Find out if we're:
     ////  multiple window: multiple windows, each view in a separate frame
     ////  single window:   one view (within the main frame) and one document at a time, as in Windows Write.
@@ -78,7 +77,7 @@ bool MyApp::OnInit(void)
     (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( "drw" , 'WXMB' , 'WXMA' ) ;
+    wxFileName::MacRegisterDefaultTypeAndCreator( wxT("drw") , 'WXMB' , 'WXMA' ) ;
 #endif
     
     if (singleWindowMode)
@@ -94,7 +93,7 @@ bool MyApp::OnInit(void)
         (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( "txt" , 'TEXT' , 'WXMA' ) ;
+        wxFileName::MacRegisterDefaultTypeAndCreator( wxT("txt") , 'TEXT' , 'WXMA' ) ;
 #endif
     }