[Scummvm-cvs-logs] CVS: scummex Makefile,1.13,1.14 resource.cpp,1.32,1.33 scummex.h,1.17,1.18 wxwindows.cpp,1.42,1.43 wxwindows.h,1.22,1.23
Adrien Mercier
yoshizf at users.sourceforge.net
Sun Apr 10 07:55:34 CEST 2005
Update of /cvsroot/scummvm/scummex
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24545
Modified Files:
Makefile resource.cpp scummex.h wxwindows.cpp wxwindows.h
Log Message:
Compile with wxWidgets 2.5
Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/scummex/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Makefile 10 Apr 2005 00:36:12 -0000 1.13
+++ Makefile 10 Apr 2005 14:55:20 -0000 1.14
@@ -10,7 +10,7 @@
CP := cp
BUILD_MAC :=
-WX_VERSION := 2.4
+WX_VERSION := 2.5
RESSW := --define __WIN32__ --define __WIN95__ --define __GNUWIN32__
REZ_CMD := `wx-config --version=$(WX_VERSION) --rezflags`
Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummex/resource.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- resource.cpp 19 Sep 2004 13:50:42 -0000 1.32
+++ resource.cpp 10 Apr 2005 14:55:20 -0000 1.33
@@ -317,7 +317,6 @@
curpos = _input.pos();
number++;
}
-
return index;
}
Index: scummex.h
===================================================================
RCS file: /cvsroot/scummvm/scummex/scummex.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- scummex.h 3 Jul 2004 14:47:43 -0000 1.17
+++ scummex.h 10 Apr 2005 14:55:20 -0000 1.18
@@ -35,7 +35,7 @@
File _output;
BlockTable _blockTable[60000];
-
+
byte _encbyte;
Image *_image;
Index: wxwindows.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummex/wxwindows.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- wxwindows.cpp 10 Apr 2005 08:02:44 -0000 1.42
+++ wxwindows.cpp 10 Apr 2005 14:55:20 -0000 1.43
@@ -169,9 +169,14 @@
EVT_MENU(ID_Scale1x, ImageWindow::Scale1x)
EVT_MENU(ID_Scale2x, ImageWindow::Scale2x)
EVT_MENU(ID_Scale3x, ImageWindow::Scale3x)
- EVT_MENU(wxID_CLOSE, ImageWindow::Close)
+ EVT_MENU(wxID_CLOSE, ImageWindow::OnMenuClose)
END_EVENT_TABLE()
+void ImageWindow::OnMenuClose(wxCommandEvent& WXUNUSED(event))
+{
+ Close(true);
+}
+
ImageWindow::ImageWindow(const wxString& title, const wxSize& size, int blockId, byte flags, int scaleFactor)
: wxFrame(_gui->_mainWindow, -1, title, wxPoint(-1,-1), size)
{
Index: wxwindows.h
===================================================================
RCS file: /cvsroot/scummvm/scummex/wxwindows.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- wxwindows.h 10 Apr 2005 00:36:12 -0000 1.22
+++ wxwindows.h 10 Apr 2005 14:55:20 -0000 1.23
@@ -125,6 +125,7 @@
int _boxesDisplayed;
void OnClose(wxCloseEvent& event);
+ void OnMenuClose(wxCommandEvent& event);
void SaveImage(wxCommandEvent& event);
void boxesDrawOverlay(wxCommandEvent& event);
void Scale1x(wxCommandEvent& event);
More information about the Scummvm-git-logs
mailing list