Correct drawing of check marks for owner-drawn items without bitmaps.

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

diff --git a/samples/docview/doc.cpp b/samples/docview/doc.cpp
index d6f77344e5dde811f4692669caccfc1477ba95e7..cf53892ea2403fc326fba2e83d91b8085f312a53 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,58 @@ wxTextCtrl* TextEditDocument::GetTextCtrl() const
     wxView* view = GetFirstView();
     return view ? wxStaticCast(view, TextEditView)->GetText() : NULL;
 }
+
+// ----------------------------------------------------------------------------
+// wxImageDocument implementation
+// ----------------------------------------------------------------------------
+
+/////////////////////////////////////////////////////////////////////////////
+// wxImageDocument
+
+IMPLEMENT_DYNAMIC_CLASS(wxImageDocument, wxDocument)
+
+wxImageDocument::wxImageDocument() : wxDocument()
+{
+}
+
+wxImageDocument::~wxImageDocument()
+{
+}
+
+bool wxImageDocument::DeleteContents()
+{
+    bool ok = wxDocument::DeleteContents();
+    if (ok && m_image.IsOk())
+    {
+        m_image.Destroy();
+    }
+    return ok;
+}
+
+bool wxImageDocument::SaveFile(wxOutputStream* stream, wxBitmapType type) const
+{
+    return m_image.IsOk() && m_image.SaveFile(*stream, type);
+}
+
+bool wxImageDocument::DoOpenDocument(const wxString& file)
+{
+    wxFileInputStream stream(file);
+    return stream.IsOk() && DoOpenDocument(&stream);
+}
+
+bool wxImageDocument::DoSaveDocument(const wxString& file)
+{
+    wxFileOutputStream stream(file);
+    return stream.IsOk() && DoSaveDocument(&stream);
+}
+
+bool wxImageDocument::DoOpenDocument(wxInputStream* stream)
+{
+    return m_image.LoadFile(*stream);
+}
+
+bool wxImageDocument::DoSaveDocument(wxOutputStream* stream) const
+{
+    return m_image.IsOk() && SaveFile(stream, m_image.GetType());
+}
+