[Scummvm-cvs-logs] SF.net SVN: scummvm: [28137] scummex/branches/gsoc2007-gameresbrowser/src
zbychs at users.sourceforge.net
zbychs at users.sourceforge.net
Wed Jul 18 15:48:15 CEST 2007
Revision: 28137
http://scummvm.svn.sourceforge.net/scummvm/?rev=28137&view=rev
Author: zbychs
Date: 2007-07-18 06:48:12 -0700 (Wed, 18 Jul 2007)
Log Message:
-----------
ImagePresenter now works under Linux.
Modified Paths:
--------------
scummex/branches/gsoc2007-gameresbrowser/src/browserapp/Makefile.am
scummex/branches/gsoc2007-gameresbrowser/src/browserapp/Makefile.in
scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/ImageBox.cpp
Modified: scummex/branches/gsoc2007-gameresbrowser/src/browserapp/Makefile.am
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/browserapp/Makefile.am 2007-07-18 13:06:03 UTC (rev 28136)
+++ scummex/branches/gsoc2007-gameresbrowser/src/browserapp/Makefile.am 2007-07-18 13:48:12 UTC (rev 28137)
@@ -3,7 +3,9 @@
#LDADD = ../core/libcore.a ../browser/libbrowser.a ../plugins/basic/libbasic.a ../plugins/scumm/libscumm.a
#LDADD =
-AM_LDFLAGS = $(WX_LIBS) \
+AM_LDFLAGS = $(WX_LIBS)
+
+LDADD = \
$(builddir)/../core/BObject.o \
$(builddir)/../core/ObjectChain.o \
$(builddir)/../core/ObjectRegistry.o \
Modified: scummex/branches/gsoc2007-gameresbrowser/src/browserapp/Makefile.in
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/browserapp/Makefile.in 2007-07-18 13:06:03 UTC (rev 28136)
+++ scummex/branches/gsoc2007-gameresbrowser/src/browserapp/Makefile.in 2007-07-18 13:48:12 UTC (rev 28137)
@@ -52,6 +52,66 @@
guicon.$(OBJEXT)
browserapp_OBJECTS = $(am_browserapp_OBJECTS)
browserapp_LDADD = $(LDADD)
+browserapp_DEPENDENCIES = $(builddir)/../core/BObject.o \
+ $(builddir)/../core/ObjectChain.o \
+ $(builddir)/../core/ObjectRegistry.o \
+ $(builddir)/../core/core.o $(builddir)/../core/core_stdafx.o \
+ $(builddir)/../core/guid.o $(builddir)/../core/pinslot.o \
+ $(builddir)/../core/rcobject.o \
+ $(builddir)/../core/safe_static.o \
+ $(builddir)/../core/tostring.o \
+ $(builddir)/../browser/CoreFileTypes.o \
+ $(builddir)/../browser/CoreInterfaces.o \
+ $(builddir)/../browser/ExplorationTree.o \
+ $(builddir)/../browser/FileTypeRecognizer.o \
+ $(builddir)/../browser/FileTypeRegistry.o \
+ $(builddir)/../browser/GUIInterfaces.o \
+ $(builddir)/../browser/PanelProvider.o \
+ $(builddir)/../browser/PluginUtil.o \
+ $(builddir)/../browser/VirtualNode.o \
+ $(builddir)/../browser/browser.o \
+ $(builddir)/../browser/browser_stdafx.o \
+ $(builddir)/../browser/simplefile.o \
+ $(builddir)/../browser/stream.o \
+ $(builddir)/../browser/wx2scstream.o \
+ $(builddir)/../browser/xorstream.o \
+ $(builddir)/../plugins/basic/AuxInterfaces.o \
+ $(builddir)/../plugins/basic/BasicParsers.o \
+ $(builddir)/../plugins/basic/BinaryPresenter.o \
+ $(builddir)/../plugins/basic/CHexEditCtrl.o \
+ $(builddir)/../plugins/basic/Directories.o \
+ $(builddir)/../plugins/basic/ImageBox.o \
+ $(builddir)/../plugins/basic/ImageProc.o \
+ $(builddir)/../plugins/basic/DirectoryPresenter.o \
+ $(builddir)/../plugins/basic/DiskFileProvider.o \
+ $(builddir)/../plugins/basic/FileInfoPresenter.o \
+ $(builddir)/../plugins/basic/HtmlPresenter.o \
+ $(builddir)/../plugins/basic/ImagePresenter.o \
+ $(builddir)/../plugins/basic/TextPresenter.o \
+ $(builddir)/../plugins/basic/IconPresenter.o \
+ $(builddir)/../plugins/basic/basic_plugin.o \
+ $(builddir)/../plugins/basic/basic_stdafx.o \
+ $(builddir)/../plugins/scumm/BlockyBlockPresenter.o \
+ $(builddir)/../plugins/scumm/ScummBlock.o \
+ $(builddir)/../plugins/scumm/ScummBlockFactory.o \
+ $(builddir)/../plugins/scumm/ScummBlockPresenter.o \
+ $(builddir)/../plugins/scumm/ScummPresenterBase.o \
+ $(builddir)/../plugins/scumm/ScummCommonPresenters.o \
+ $(builddir)/../plugins/scumm/ScummSpecificPresenters.o \
+ $(builddir)/../plugins/scumm/ScummSpecificPresenters2.o \
+ $(builddir)/../plugins/scumm/ScummFileTypes.o \
+ $(builddir)/../plugins/scumm/ScummParser.o \
+ $(builddir)/../plugins/scumm/ScummRecognizer.o \
+ $(builddir)/../plugins/scumm/ScummResource.o \
+ $(builddir)/../plugins/scumm/ScummTag.o \
+ $(builddir)/../plugins/scumm/bomp.o \
+ $(builddir)/../plugins/scumm/codec37.o \
+ $(builddir)/../plugins/scumm/codec47.o \
+ $(builddir)/../plugins/scumm/descumm.o \
+ $(builddir)/../plugins/scumm/descumm6.o \
+ $(builddir)/../plugins/scumm/scaler.o \
+ $(builddir)/../plugins/scumm/scumm_plugin.o \
+ $(builddir)/../plugins/scumm/scumm_stdafx.o
DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
am__depfiles_maybe = depfiles
@@ -180,7 +240,8 @@
#LDADD = ../core/libcore.a ../browser/libbrowser.a ../plugins/basic/libbasic.a ../plugins/scumm/libscumm.a
#LDADD =
-AM_LDFLAGS = $(WX_LIBS) \
+AM_LDFLAGS = $(WX_LIBS)
+LDADD = \
$(builddir)/../core/BObject.o \
$(builddir)/../core/ObjectChain.o \
$(builddir)/../core/ObjectRegistry.o \
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/ImageBox.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/ImageBox.cpp 2007-07-18 13:06:03 UTC (rev 28136)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/ImageBox.cpp 2007-07-18 13:48:12 UTC (rev 28137)
@@ -124,6 +124,9 @@
void wxImageBox::Paint()
{
+ if (!GetImage().Ok())
+ return;
+
// image width & height
m_imageWidth = (int) (GetImage().GetWidth()*m_scale);
m_imageHeight = (int) (GetImage().GetHeight()*m_scale);
@@ -175,14 +178,18 @@
void wxImageBox::OnPaint(wxPaintEvent &event)
{
+ if (!GetImage().Ok())
+ return;
+
wxRect paintRect = getPaintRect();
if (paintRect.GetRight() >= m_imageWidth)
paintRect.width = m_imageWidth - paintRect.x;
if (paintRect.GetBottom() >= m_imageHeight)
paintRect.height = m_imageHeight - paintRect.y;
- wxRect bufferRect(m_bufferX, m_bufferY,
- m_buffer->GetWidth(), m_buffer->GetHeight());
- if (m_repaint ||
+ int w = m_buffer->Ok() ? m_buffer->GetWidth() : 0;
+ int h = m_buffer->Ok() ? m_buffer->GetHeight() : 0;
+ wxRect bufferRect(m_bufferX, m_bufferY, w, h);
+ if (!m_buffer->Ok() || m_repaint ||
paintRect.x < bufferRect.x ||
paintRect.y < bufferRect.y ||
paintRect.GetRight() > bufferRect.GetRight() ||
@@ -224,11 +231,14 @@
m_buffer = new wxBitmap;
m_bufferX = m_bufferY = 0;
m_imageWidth = m_imageHeight = 0;
- SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BACKGROUND));
}
void wxPaintBox::OnPaint(wxPaintEvent& WXUNUSED(event))
{
+ if (!m_buffer->Ok())
+ return;
+
SetVirtualSize(m_imageWidth, m_imageHeight);
wxPaintDC dc(this);
@@ -255,11 +265,11 @@
wxRect ScaleRect(wxRect rect, double scale)
{
- wxRect res;
- res.x = (int) (rect.x*scale);
- res.y = (int) (rect.y*scale);
- res.width = (int) (rect.width*scale);
- res.height = (int) (rect.height*scale);
- return res;
+ wxRect res;
+ res.x = (int) (rect.x*scale);
+ res.y = (int) (rect.y*scale);
+ res.width = (int) (rect.width*scale);
+ res.height = (int) (rect.height*scale);
+ return res;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list