No changes, just cleanup the image part of the docview sample.

Remove unnecessary, never used methods.

Don't use pointers when objects or references can be used more safely.

Don't name classes which are not part of wx with "wx" prefix to avoid
confusing people.

Don't define empty unnecessary event tables.

Prefer wxScrolledWindow::SetVirtualSize() to SetScrollbars().

Stop using "protected" when "private" should be used.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64300 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-05-13 14:37:06 +00:00
parent 2954883593
commit 2d4a03f8a7
5 changed files with 47 additions and 107 deletions

View File

@@ -250,56 +250,13 @@ wxTextCtrl* TextEditDocument::GetTextCtrl() const
}
// ----------------------------------------------------------------------------
// wxImageDocument implementation
// ImageDocument and wxImageDetailsDocument implementation
// ----------------------------------------------------------------------------
/////////////////////////////////////////////////////////////////////////////
// wxImageDocument
IMPLEMENT_DYNAMIC_CLASS(ImageDocument, wxDocument)
IMPLEMENT_DYNAMIC_CLASS(wxImageDocument, wxDocument)
wxImageDocument::wxImageDocument() : wxDocument()
bool ImageDocument::DoOpenDocument(const wxString& file)
{
}
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());
return m_image.LoadFile(file);
}