[Scummvm-cvs-logs] SF.net SVN: scummvm: [28136] scummex/branches/gsoc2007-gameresbrowser/src
zbychs at users.sourceforge.net
zbychs at users.sourceforge.net
Wed Jul 18 15:06:04 CEST 2007
Revision: 28136
http://scummvm.svn.sourceforge.net/scummvm/?rev=28136&view=rev
Author: zbychs
Date: 2007-07-18 06:06:03 -0700 (Wed, 18 Jul 2007)
Log Message:
-----------
The ImagePresenter still flawed under Linux.
Modified Paths:
--------------
scummex/branches/gsoc2007-gameresbrowser/src/browser/Makefile.in
scummex/branches/gsoc2007-gameresbrowser/src/browserapp/Makefile.in
scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/CHexEditCtrl.cpp
scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/CHexEditCtrl.h
scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/ImagePresenter.cpp
scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/ImagePresenter.h
scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/Makefile.in
Modified: scummex/branches/gsoc2007-gameresbrowser/src/browser/Makefile.in
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/browser/Makefile.in 2007-07-18 11:40:15 UTC (rev 28135)
+++ scummex/branches/gsoc2007-gameresbrowser/src/browser/Makefile.in 2007-07-18 13:06:03 UTC (rev 28136)
@@ -48,11 +48,10 @@
libbrowser_a_AR = $(AR) $(ARFLAGS)
libbrowser_a_LIBADD =
am_libbrowser_a_OBJECTS = CoreFileTypes.$(OBJEXT) \
- CoreInterfaces.$(OBJEXT) Directories.$(OBJEXT) \
- ExplorationTree.$(OBJEXT) FileTypeRecognizer.$(OBJEXT) \
- FileTypeRegistry.$(OBJEXT) GUIInterfaces.$(OBJEXT) \
- PanelProvider.$(OBJEXT) PluginUtil.$(OBJEXT) \
- VirtualNode.$(OBJEXT) browser.$(OBJEXT) \
+ CoreInterfaces.$(OBJEXT) ExplorationTree.$(OBJEXT) \
+ FileTypeRecognizer.$(OBJEXT) FileTypeRegistry.$(OBJEXT) \
+ GUIInterfaces.$(OBJEXT) PanelProvider.$(OBJEXT) \
+ PluginUtil.$(OBJEXT) VirtualNode.$(OBJEXT) browser.$(OBJEXT) \
browser_stdafx.$(OBJEXT) simplefile.$(OBJEXT) stream.$(OBJEXT) \
wx2scstream.$(OBJEXT) xorstream.$(OBJEXT)
libbrowser_a_OBJECTS = $(am_libbrowser_a_OBJECTS)
@@ -187,8 +186,6 @@
CoreFileTypes.h \
CoreInterfaces.cpp \
CoreInterfaces.h \
- Directories.cpp \
- Directories.h \
DirectoryController.h \
ExplorationTree.cpp \
ExplorationTree.h \
@@ -269,7 +266,6 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/CoreFileTypes.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/CoreInterfaces.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/Directories.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ExplorationTree.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/FileTypeRecognizer.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/FileTypeRegistry.Po at am__quote@
Modified: scummex/branches/gsoc2007-gameresbrowser/src/browserapp/Makefile.in
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/browserapp/Makefile.in 2007-07-18 11:40:15 UTC (rev 28135)
+++ scummex/branches/gsoc2007-gameresbrowser/src/browserapp/Makefile.in 2007-07-18 13:06:03 UTC (rev 28136)
@@ -47,8 +47,9 @@
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
am_browserapp_OBJECTS = BrowserApp.$(OBJEXT) MainForm.$(OBJEXT) \
- MainFormCommands.$(OBJEXT) Test1.$(OBJEXT) Test2.$(OBJEXT) \
- browserapp_stdafx.$(OBJEXT) guicon.$(OBJEXT)
+ MainFormCommands.$(OBJEXT) Tests.$(OBJEXT) \
+ DefaultPlugin.$(OBJEXT) browserapp_stdafx.$(OBJEXT) \
+ guicon.$(OBJEXT)
browserapp_OBJECTS = $(am_browserapp_OBJECTS)
browserapp_LDADD = $(LDADD)
DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
@@ -193,7 +194,6 @@
\
$(builddir)/../browser/CoreFileTypes.o \
$(builddir)/../browser/CoreInterfaces.o \
- $(builddir)/../browser/Directories.o \
$(builddir)/../browser/ExplorationTree.o \
$(builddir)/../browser/FileTypeRecognizer.o \
$(builddir)/../browser/FileTypeRegistry.o \
@@ -210,7 +210,9 @@
\
$(builddir)/../plugins/basic/AuxInterfaces.o \
$(builddir)/../plugins/basic/BasicParsers.o \
- $(builddir)/../plugins/basic/BitmapPanel.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 \
@@ -252,8 +254,8 @@
MainForm.cpp \
MainForm.h \
MainFormCommands.cpp \
- Test1.cpp \
- Test2.cpp \
+ Tests.cpp \
+ DefaultPlugin.cpp \
browserapp_stdafx.cpp \
browserapp_stdafx.h \
guicon.cpp \
@@ -326,10 +328,10 @@
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/BrowserApp.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/DefaultPlugin.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/MainForm.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/MainFormCommands.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/Test1.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/Test2.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/Tests.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/browserapp_stdafx.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/guicon.Po at am__quote@
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/CHexEditCtrl.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/CHexEditCtrl.cpp 2007-07-18 11:40:15 UTC (rev 28135)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/CHexEditCtrl.cpp 2007-07-18 13:06:03 UTC (rev 28136)
@@ -12,12 +12,8 @@
#include <wx/caret.h>
#include <wx/clipbrd.h>
-#include <crtdbg.h>
+#include "debugmem.h"
-#ifdef _DEBUG
-#define DEBUG_NEW new( _CLIENT_BLOCK, __FILE__, __LINE__)
-#define new DEBUG_NEW
-#endif
enum EDIT_MODE { // m_editMode flags
EDIT_BYTES = 1,
@@ -165,14 +161,15 @@
/////////////////////////////////////////////////////////////////////////////
// Painting
-void CHexEditCtrl::TextOutWithCheck(wxDC& dc, const wxRect& rcInvalid, int x, int y, wxString& strText) {
+void CHexEditCtrl::TextOutWithCheck(wxDC& dc, const wxRect& rcInvalid, int x, int y, const wxString& strText) {
wxRect rcText(x, y, x + (int)strText.Length() * m_cellSize.GetWidth(), y + m_cellSize.GetHeight());
//if(!rcText.Intersect(rcInvalid).IsEmpty())
dc.DrawText(strText, x, y);
}
void CHexEditCtrl::CharOutWithCheck(wxDC& dc, const wxRect &rcInvalid, int x, int y, wxChar wChar) {
- TextOutWithCheck(dc, rcInvalid, x, y, wxString(wChar));
+ wxString str(wChar);
+ TextOutWithCheck(dc, rcInvalid, x, y, str);
}
void CHexEditCtrl::OnPaint(wxPaintEvent& _event)
@@ -866,7 +863,7 @@
{
if((nChar >= '0' && nChar <= '9') || (nChar >= 'a' && nChar <= 'f') || (nChar >= 'A' && nChar <= 'F'))
{
- UINT b = nChar - '0';
+ wxUint32 b = nChar - '0';
if(b > 9)
{
if (b <= 'F' - '0')
@@ -874,7 +871,7 @@
else
b = 10 + nChar - 'a';
}
- UINT mask = 0xFUL << (( m_digitsInData - m_nEditDigit - 1 )*4);
+ wxUint32 mask = 0xFUL << (( m_digitsInData - m_nEditDigit - 1 )*4);
if ( !EnterNumber())
return;
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/CHexEditCtrl.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/CHexEditCtrl.h 2007-07-18 11:40:15 UTC (rev 28135)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/CHexEditCtrl.h 2007-07-18 13:06:03 UTC (rev 28136)
@@ -234,7 +234,7 @@
void HideCaret();
/*! This function calls pdc->TextOut ( x, y, strText ) function if text overlaps with rcInvalid.*/
- void TextOutWithCheck(wxDC& dc, const wxRect& rcInvalid, int x, int y, wxString& strText);
+ void TextOutWithCheck(wxDC& dc, const wxRect& rcInvalid, int x, int y, const wxString& strText);
/*! This function calls pdc->TextOut ( x, y, eChar ) function if char overlaps with rcInvalid.*/
void CharOutWithCheck(wxDC& dc, const wxRect &rcInvalid, int x, int y, wxChar wChar);
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/ImagePresenter.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/ImagePresenter.cpp 2007-07-18 11:40:15 UTC (rev 28135)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/ImagePresenter.cpp 2007-07-18 13:06:03 UTC (rev 28136)
@@ -36,11 +36,11 @@
ImagePresenter::ImagePresenter()
-: _bitmap(NULL), _evtHelper(this) {}
+: _image(NULL), _evtHelper(this) {}
ImagePresenter::~ImagePresenter() {
- if (_bitmap)
- delete _bitmap;
+ if (_image)
+ delete _image;
}
coreString ImagePresenter::getPanelTitle() {
@@ -51,14 +51,14 @@
//infoout << wxT("ImagePresenter::panelActivate()") << std::endl;
create();
- if (!_bitmap)
+ if (!_image)
return;
wxBoxSizer *panelsizer = new wxBoxSizer( wxVERTICAL );
//wxPanel *bmpPanel = new BitmapPanel(panel, *_bitmap);
_bmpPanel = new wxImageBox(panel);
- _bmpPanel->GetImage() = _bitmap->ConvertToImage();
+ _bmpPanel->GetImage() = *_image;
panelsizer->Add(_bmpPanel, 1, wxALL|wxEXPAND, 0);
wxBoxSizer *buttonsizer = new wxBoxSizer( wxHORIZONTAL );
@@ -99,7 +99,7 @@
void ImagePresenter::create() {
//infoout << wxT("ImagePresenter::create()") << std::endl;
- if (_bitmap)
+ if (_image)
return;
IImage* iimage = _imageSlot->getInterface();
@@ -116,7 +116,9 @@
return;
}
- _bitmap = new wxBitmap(*image);
+ //_bitmap = new wxBitmap(*image);
+ _image = new wxImage();
+ *_image = *image;
_imageSlot->releaseInterface();
}
@@ -144,7 +146,7 @@
//infoout << wxT("FileInfoPresenter::dumpFile(): ") << std::endl;
create();
- if (!_bitmap)
+ if (!_image)
return;
wxFileDialog *saveDlg;
@@ -153,7 +155,7 @@
if (res == wxID_OK) {
wxString fileName = saveDlg->GetPath();
- bool res = _bitmap->SaveFile(fileName, wxBITMAP_TYPE_BMP);
+ bool res = _image->SaveFile(fileName, wxBITMAP_TYPE_BMP);
if (!res) {
wxMessageBox(wxString(wxT("Error writing file: ")) + fileName,
wxT("Dumping Image Failed"), wxOK | wxICON_ERROR, PluginUtil::getMainForm());
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/ImagePresenter.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/ImagePresenter.h 2007-07-18 11:40:15 UTC (rev 28135)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/ImagePresenter.h 2007-07-18 13:06:03 UTC (rev 28136)
@@ -50,7 +50,8 @@
Slot<IImage>* _imageSlot;
Pin<IPanelReciever>* _panelRecieverPin;
- wxBitmap* _bitmap;
+ //wxBitmap* _bitmap;
+ wxImage* _image;
wxImageBox* _bmpPanel;
DumpImageEvtHandler _evtHelper;
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/Makefile.in
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/Makefile.in 2007-07-18 11:40:15 UTC (rev 28135)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/Makefile.in 2007-07-18 13:06:03 UTC (rev 28136)
@@ -49,7 +49,8 @@
libbasic_a_AR = $(AR) $(ARFLAGS)
libbasic_a_LIBADD =
am_libbasic_a_OBJECTS = AuxInterfaces.$(OBJEXT) BasicParsers.$(OBJEXT) \
- BitmapPanel.$(OBJEXT) ImageBox.$(OBJEXT) ImageProc.$(OBJEXT) \
+ BinaryPresenter.$(OBJEXT) CHexEditCtrl.$(OBJEXT) \
+ Directories.$(OBJEXT) ImageBox.$(OBJEXT) ImageProc.$(OBJEXT) \
DirectoryPresenter.$(OBJEXT) DiskFileProvider.$(OBJEXT) \
FileInfoPresenter.$(OBJEXT) HtmlPresenter.$(OBJEXT) \
ImagePresenter.$(OBJEXT) TextPresenter.$(OBJEXT) \
@@ -196,8 +197,12 @@
AuxInterfaces.h \
BasicParsers.cpp \
BasicParsers.h \
- BitmapPanel.cpp \
- BitmapPanel.h \
+ BinaryPresenter.cpp \
+ BinaryPresenter.h \
+ CHexEditCtrl.cpp \
+ CHexEditCtrl.h \
+ Directories.cpp \
+ Directories.h \
ImageBox.cpp \
ImageBox.h \
ImageProc.cpp \
@@ -271,7 +276,9 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/AuxInterfaces.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/BasicParsers.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/BitmapPanel.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/BinaryPresenter.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/CHexEditCtrl.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/Directories.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/DirectoryPresenter.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/DiskFileProvider.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/FileInfoPresenter.Po at am__quote@
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