[Scummvm-cvs-logs] SF.net SVN: scummvm: [28066] scummex/branches/gsoc2007-gameresbrowser/src
zbychs at users.sourceforge.net
zbychs at users.sourceforge.net
Sat Jul 14 15:03:31 CEST 2007
Revision: 28066
http://scummvm.svn.sourceforge.net/scummvm/?rev=28066&view=rev
Author: zbychs
Date: 2007-07-14 06:03:30 -0700 (Sat, 14 Jul 2007)
Log Message:
-----------
Detachable panels work now under Linux.
Modified Paths:
--------------
scummex/branches/gsoc2007-gameresbrowser/src/browser/ExplorationTree.cpp
scummex/branches/gsoc2007-gameresbrowser/src/browserapp/MainFormCommands.cpp
scummex/branches/gsoc2007-gameresbrowser/src/browserapp/icons/defdir_icon.xpm
scummex/branches/gsoc2007-gameresbrowser/src/browserapp/icons/deffile_icon.xpm
scummex/branches/gsoc2007-gameresbrowser/src/browserapp/icons.h
scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/Makefile.am
scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/Makefile.in
Modified: scummex/branches/gsoc2007-gameresbrowser/src/browser/ExplorationTree.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/browser/ExplorationTree.cpp 2007-07-14 12:35:25 UTC (rev 28065)
+++ scummex/branches/gsoc2007-gameresbrowser/src/browser/ExplorationTree.cpp 2007-07-14 13:03:30 UTC (rev 28066)
@@ -17,6 +17,7 @@
#include <algorithm>
#include <wx/wx.h>
+#include <wx/imaglist.h>
#include "debugmem.h"
@@ -580,7 +581,7 @@
//If we are in the Notebook, and want to detach, we have to fix the indexes of
//other panels.
void PanelInfo::removeIdx() {
- if (_pageIdx == -1)
+ if (_pageIdx == (size_t)(-1))
return;
//fix the indexes of the other panels
@@ -646,7 +647,7 @@
std::list<PanelInfo*>::iterator i;
for (i = _activePanels.begin(); i != _activePanels.end(); ++i) {
PanelInfo* pinfo = *i;
- if (pinfo->getPageIdx() == pageIdx)
+ if (pinfo->getPageIdx() == (size_t)pageIdx)
return pinfo;
}
return NULL;
Modified: scummex/branches/gsoc2007-gameresbrowser/src/browserapp/MainFormCommands.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/browserapp/MainFormCommands.cpp 2007-07-14 12:35:25 UTC (rev 28065)
+++ scummex/branches/gsoc2007-gameresbrowser/src/browserapp/MainFormCommands.cpp 2007-07-14 13:03:30 UTC (rev 28066)
@@ -30,6 +30,7 @@
#include <wx/stdpaths.h>
#include <wx/choicdlg.h>
#include <wx/filename.h>
+#include <wx/imaglist.h>
#include "ObjectChain.h"
@@ -273,3 +274,4 @@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
+
Modified: scummex/branches/gsoc2007-gameresbrowser/src/browserapp/icons/defdir_icon.xpm
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/browserapp/icons/defdir_icon.xpm 2007-07-14 12:35:25 UTC (rev 28065)
+++ scummex/branches/gsoc2007-gameresbrowser/src/browserapp/icons/defdir_icon.xpm 2007-07-14 13:03:30 UTC (rev 28066)
@@ -59,4 +59,4 @@
" -.03JKL<?BDGI!!",
" !!!!!!!!!!!!! ",
" ",
-" "};
\ No newline at end of file
+" "};
Modified: scummex/branches/gsoc2007-gameresbrowser/src/browserapp/icons/deffile_icon.xpm
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/browserapp/icons/deffile_icon.xpm 2007-07-14 12:35:25 UTC (rev 28065)
+++ scummex/branches/gsoc2007-gameresbrowser/src/browserapp/icons/deffile_icon.xpm 2007-07-14 13:03:30 UTC (rev 28066)
@@ -103,4 +103,4 @@
" 6ghijklmno6* ",
" 6pqrstuvwx6* ",
" 6y666666666* ",
-" 6*********** "};
\ No newline at end of file
+" 6*********** "};
Modified: scummex/branches/gsoc2007-gameresbrowser/src/browserapp/icons.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/browserapp/icons.h 2007-07-14 12:35:25 UTC (rev 28065)
+++ scummex/branches/gsoc2007-gameresbrowser/src/browserapp/icons.h 2007-07-14 13:03:30 UTC (rev 28066)
@@ -24,13 +24,14 @@
#ifndef ICONS_H
#define ICONS_H
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
- #include "scummex.xpm"
-#endif
+//#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
+// #include "scummex.xpm"
+//#endif
#include "icons/defdir_icon.xpm"
#include "icons/deffile_icon.xpm"
+/*
#include "icons/open_icon.xpm"
#include "icons/save_icon.xpm"
#include "icons/exit_icon.xpm"
@@ -40,6 +41,7 @@
#include "icons/close_icon.xpm"
#include "icons/file_icon.xpm"
#include "icons/hex_icon.xpm"
+*/
#include "icons/xpm_0.xpm"
#include "icons/xpm_1.xpm"
@@ -309,3 +311,4 @@
#endif
+
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/Makefile.am
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/Makefile.am 2007-07-14 12:35:25 UTC (rev 28065)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/Makefile.am 2007-07-14 13:03:30 UTC (rev 28066)
@@ -20,6 +20,8 @@
ImagePresenter.h \
TextPresenter.cpp \
TextPresenter.h \
+ IconPresenter.cpp \
+ IconPresenter.h \
basic_plugin.cpp \
basic_plugin.h \
basic_stdafx.cpp \
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/Makefile.in
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/Makefile.in 2007-07-14 12:35:25 UTC (rev 28065)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/Makefile.in 2007-07-14 13:03:30 UTC (rev 28066)
@@ -52,8 +52,8 @@
BitmapPanel.$(OBJEXT) DirectoryPresenter.$(OBJEXT) \
DiskFileProvider.$(OBJEXT) FileInfoPresenter.$(OBJEXT) \
HtmlPresenter.$(OBJEXT) ImagePresenter.$(OBJEXT) \
- TextPresenter.$(OBJEXT) basic_plugin.$(OBJEXT) \
- basic_stdafx.$(OBJEXT)
+ TextPresenter.$(OBJEXT) IconPresenter.$(OBJEXT) \
+ basic_plugin.$(OBJEXT) basic_stdafx.$(OBJEXT)
libbasic_a_OBJECTS = $(am_libbasic_a_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
@@ -210,6 +210,8 @@
ImagePresenter.h \
TextPresenter.cpp \
TextPresenter.h \
+ IconPresenter.cpp \
+ IconPresenter.h \
basic_plugin.cpp \
basic_plugin.h \
basic_stdafx.cpp \
@@ -270,6 +272,7 @@
@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@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/HtmlPresenter.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/IconPresenter.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ImagePresenter.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/TextPresenter.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/basic_plugin.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