slightly updated makefiles

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

diff --git a/samples/docview/doc.cpp b/samples/docview/doc.cpp
index 5e871203a659285fae6eeb820f9e0475b2fb7e62..23a531614357f20cd2df2d8a95c39a93ffe8eda6 100644 (file)
--- a/samples/docview/doc.cpp
+++ b/samples/docview/doc.cpp
@@ -24,8 +24,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 "doc.h"
@@ -203,7 +203,7 @@ bool DrawingCommand::Undo(void)
         doc->GetDoodleSegments().Append(segment);
         doc->Modify(TRUE);
         doc->UpdateAllViews();
-        segment = NULL;
+        segment = (DoodleSegment *) NULL;
       }
       doc->Modify(TRUE);
       doc->UpdateAllViews();
@@ -258,7 +258,7 @@ bool TextEditDocument::IsModified(void) const
   TextEditView *view = (TextEditView *)GetFirstView();
   if (view)
   {
-    return (wxDocument::IsModified() || view->textsw->Modified());
+    return (wxDocument::IsModified() || view->textsw->IsModified());
   }
   else
     return wxDocument::IsModified();