Updated configure for small, probably futile iPhone-related changes

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

diff --git a/samples/docview/doc.cpp b/samples/docview/doc.cpp
index d6f77344e5dde811f4692669caccfc1477ba95e7..05c92d588f253c6d7f7cd07395c1e729d08bf14a 100644 (file)
--- a/samples/docview/doc.cpp
+++ b/samples/docview/doc.cpp
@@ -34,6 +34,7 @@
 #else
     #include "wx/txtstrm.h"
 #endif
+#include "wx/wfstream.h"
 
 #include "doc.h"
 #include "view.h"
@@ -193,7 +194,7 @@ bool wxTextDocument::OnCreate(const wxString& path, long flags)
 
     return true;
 }
-    
+
 // Since text windows have their own method for saving to/loading from files,
 // we override DoSave/OpenDocument instead of Save/LoadObject
 bool wxTextDocument::DoSaveDocument(const wxString& filename)
@@ -203,7 +204,13 @@ bool wxTextDocument::DoSaveDocument(const wxString& filename)
 
 bool wxTextDocument::DoOpenDocument(const wxString& filename)
 {
-    return GetTextCtrl()->LoadFile(filename);
+    if ( !GetTextCtrl()->LoadFile(filename) )
+        return false;
+
+    // we're not modified by the user yet
+    Modify(false);
+
+    return true;
 }
 
 bool wxTextDocument::IsModified() const
@@ -241,3 +248,15 @@ wxTextCtrl* TextEditDocument::GetTextCtrl() const
     wxView* view = GetFirstView();
     return view ? wxStaticCast(view, TextEditView)->GetText() : NULL;
 }
+
+// ----------------------------------------------------------------------------
+// ImageDocument and wxImageDetailsDocument implementation
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(ImageDocument, wxDocument)
+
+bool ImageDocument::DoOpenDocument(const wxString& file)
+{
+    return m_image.LoadFile(file);
+}
+