Committing menubar changes again after CVS trashed them.

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

diff --git a/samples/docview/docview.cpp b/samples/docview/docview.cpp
index 1d814fd140c3b52d3882b440e8b95029424e128d..b142b5f84338d8f0c8bbf36ccc1ae7fd31795ca1 100644 (file)
--- a/samples/docview/docview.cpp
+++ b/samples/docview/docview.cpp
@@ -31,8 +31,8 @@
 #include "wx/wx.h"
 #endif
 
-#if !USE_DOC_VIEW_ARCHITECTURE
-#error You must set USE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
+#if !wxUSE_DOC_VIEW_ARCHITECTURE
+#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in setup.h!
 #endif
 
 #include "wx/docview.h"
@@ -62,7 +62,7 @@ bool MyApp::OnInit(void)
   ///   single window : (one document at a time, only one frame, as in Windows Write)
   if (argc > 1)
   {
-    if (strcmp(argv[1], "-single") == 0)
+    if (wxStrcmp(argv[1], _T("-single")) == 0)
     {
       singleWindowMode = TRUE;
     }
@@ -257,6 +257,8 @@ MyCanvas *MyFrame::CreateCanvas(wxView *view, wxFrame *parent)
 
   // Give it scrollbars
   canvas->SetScrollbars(20, 20, 50, 50);
+  canvas->SetBackgroundColour(*wxWHITE);
+  canvas->Clear();
 
   return canvas;
 }