X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/457814b5aa2ee5c83abc65a6aee2a3ebcb1af34f..e27ce4e910f99ab572a609b7d560abf56440f81d:/samples/docview/doc.cpp?ds=sidebyside diff --git a/samples/docview/doc.cpp b/samples/docview/doc.cpp index 5e871203a6..04e328c621 100644 --- 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 wx_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();