1. fatal typo in colour copying in wxStyleInfo ctor fixed

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

diff --git a/samples/docvwmdi/doc.cpp b/samples/docvwmdi/doc.cpp
index 662fe82e16ba336a7ef647d67be1cd2df15f7b12..23a531614357f20cd2df2d8a95c39a93ffe8eda6 100644 (file)
--- a/samples/docvwmdi/doc.cpp
+++ b/samples/docvwmdi/doc.cpp
@@ -24,8 +24,8 @@
 #include "wx/wx.h"
 #endif
 
 #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"
 #endif
 
 #include "doc.h"


@@ -203,7 +203,7 @@ bool DrawingCommand::Undo(void)
         doc->GetDoodleSegments().Append(segment);
         doc->Modify(TRUE);
         doc->UpdateAllViews();
         doc->GetDoodleSegments().Append(segment);
         doc->Modify(TRUE);
         doc->UpdateAllViews();

-        segment = NULL;
+        segment = (DoodleSegment *) NULL;

       }
       doc->Modify(TRUE);
       doc->UpdateAllViews();
       }
       doc->Modify(TRUE);
       doc->UpdateAllViews();