Check axis number in the received joystick messages.

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

diff --git a/samples/docview/doc.cpp b/samples/docview/doc.cpp
index 4108800ede819228ca2582274191c483f47874f8..efdbf8adf7edd21ff11c7a8fe5db8c916e73fdb6 100644 (file)
--- a/samples/docview/doc.cpp
+++ b/samples/docview/doc.cpp
@@ -7,7 +7,7 @@
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart
 //              (c) 2008 Vadim Zeitlin
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart
 //              (c) 2008 Vadim Zeitlin

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ----------------------------------------------------------------------------
 /////////////////////////////////////////////////////////////////////////////
 
 // ----------------------------------------------------------------------------


@@ -34,6 +34,7 @@
 #else
     #include "wx/txtstrm.h"
 #endif
 #else
     #include "wx/txtstrm.h"
 #endif

+#include "wx/wfstream.h"

 
 #include "doc.h"
 #include "view.h"
 
 #include "doc.h"
 #include "view.h"


@@ -78,6 +79,16 @@ DocumentIstream& DrawingDocument::LoadObject(DocumentIstream& istream)
 
     wxInt32 count = 0;
     stream >> count;
 
     wxInt32 count = 0;
     stream >> count;

+    if ( count < 0 )
+    {
+        wxLogWarning("Drawing document corrupted: invalid segments count.");
+#if wxUSE_STD_IOSTREAM
+        istream.clear(std::ios::badbit);
+#else
+        istream.Reset(wxSTREAM_READ_ERROR);
+#endif
+        return istream;
+    }

 
     for ( int n = 0; n < count; n++ )
     {
 
     for ( int n = 0; n < count; n++ )
     {


@@ -171,42 +182,117 @@ DocumentIstream& DoodleSegment::LoadObject(DocumentIstream& istream)
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// TextEditDocument implementation
+// wxTextDocument: wxDocument and wxTextCtrl married

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(TextEditDocument, wxDocument)
+IMPLEMENT_CLASS(wxTextDocument, wxDocument)
+
+bool wxTextDocument::OnCreate(const wxString& path, long flags)
+{
+    if ( !wxDocument::OnCreate(path, flags) )
+        return false;
+
+    // subscribe to changes in the text control to update the document state
+    // when it's modified
+    GetTextCtrl()->Connect
+    (
+        wxEVT_TEXT,
+        wxCommandEventHandler(wxTextDocument::OnTextChange),
+        NULL,
+        this
+    );
+
+    return true;
+}

 
 // Since text windows have their own method for saving to/loading from files,
 // we override DoSave/OpenDocument instead of Save/LoadObject
 
 // Since text windows have their own method for saving to/loading from files,
 // we override DoSave/OpenDocument instead of Save/LoadObject

-bool TextEditDocument::DoSaveDocument(const wxString& filename)
+bool wxTextDocument::DoSaveDocument(const wxString& filename)

 {
 {

-    return GetFirstView()->GetText()->SaveFile(filename);
+    return GetTextCtrl()->SaveFile(filename);

 }
 
 }
 

-bool TextEditDocument::DoOpenDocument(const wxString& filename)
+bool wxTextDocument::DoOpenDocument(const wxString& filename)

 {
 {

-    return GetFirstView()->GetText()->LoadFile(filename);
+    if ( !GetTextCtrl()->LoadFile(filename) )
+        return false;
+
+    // we're not modified by the user yet
+    Modify(false);
+
+    return true;

 }
 
 }
 

-bool TextEditDocument::IsModified() const
+bool wxTextDocument::IsModified() const

 {
 {

-    TextEditView* view = GetFirstView();
-    return wxDocument::IsModified() || (view && view->GetText()->IsModified());
+    wxTextCtrl* wnd = GetTextCtrl();
+    return wxDocument::IsModified() || (wnd && wnd->IsModified());

 }
 
 }
 

-void TextEditDocument::Modify(bool modified)
+void wxTextDocument::Modify(bool modified)

 {
 {

-    TextEditView* view = GetFirstView();
-

     wxDocument::Modify(modified);
 
     wxDocument::Modify(modified);
 

-    if ( !modified && view && view->GetText() )
-        view->GetText()->DiscardEdits();
+    wxTextCtrl* wnd = GetTextCtrl();
+    if (wnd && !modified)
+    {
+        wnd->DiscardEdits();
+    }
+}
+
+void wxTextDocument::OnTextChange(wxCommandEvent& event)
+{
+    Modify(true);
+
+    event.Skip();

 }
 
 }
 

-TextEditView* TextEditDocument::GetFirstView() const
+// ----------------------------------------------------------------------------
+// TextEditDocument implementation
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(TextEditDocument, wxDocument)
+
+wxTextCtrl* TextEditDocument::GetTextCtrl() const

 {
 {

-    wxView* view = wxDocument::GetFirstView();
-    return view ? wxStaticCast(view, TextEditView) : NULL;
+    wxView* view = GetFirstView();
+    return view ? wxStaticCast(view, TextEditView)->GetText() : NULL;

 }
 
 }
 

+// ----------------------------------------------------------------------------
+// ImageDocument and ImageDetailsDocument implementation
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(ImageDocument, wxDocument)
+
+bool ImageDocument::DoOpenDocument(const wxString& file)
+{
+    return m_image.LoadFile(file);
+}
+
+bool ImageDocument::OnOpenDocument(const wxString& filename)
+{
+    if ( !wxDocument::OnOpenDocument(filename) )
+        return false;
+
+    // we don't have a wxDocTemplate for the image details document as it's
+    // never created by wxWidgets automatically, instead just do it manually
+    ImageDetailsDocument * const docDetails = new ImageDetailsDocument(this);
+    docDetails->SetFilename(filename);
+
+    new ImageDetailsView(docDetails);
+
+    return true;
+}
+
+ImageDetailsDocument::ImageDetailsDocument(ImageDocument *parent)
+    : wxDocument(parent)
+{
+    const wxImage image = parent->GetImage();
+
+    m_size.x = image.GetWidth();
+    m_size.y = image.GetHeight();
+    m_numColours = image.CountColours();
+    m_type = image.GetType();
+    m_hasAlpha = image.HasAlpha();
+}