[Scummvm-cvs-logs] CVS: scummex Makefile,1.12,1.13 wxwindows.cpp,1.40,1.41 wxwindows.h,1.21,1.22

[Adrien Mercier]

Update of /cvsroot/scummvm/scummex
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30422

Modified Files:
	Makefile wxwindows.cpp wxwindows.h 
Log Message:
- Fix for closing with the File menu
- Added a variable to choose wxWidgets version


Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/scummex/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Makefile	3 Jul 2004 14:47:43 -0000	1.12
+++ Makefile	10 Apr 2005 00:36:12 -0000	1.13
@@ -9,14 +9,15 @@
 ZIP     := zip -q
 CP      := cp
 
-BUILD_MAC:=
+BUILD_MAC  :=
+WX_VERSION := 2.4
 
 RESSW    := --define __WIN32__ --define __WIN95__ --define __GNUWIN32__
-REZ_CMD  := `wx-config --rezflags`
+REZ_CMD  := `wx-config --version=$(WX_VERSION) --rezflags`
 OBJS     := file.o scummex.o resource.o image.o wxwindows.o descumm.o descumm6.o codec37.o codec47.o bomp.o scaler.o util.o akos.o
 CXXFLAGS := -DOSUNIX -g -O -Wall -Wuninitialized -Wshadow -Wno-unused-variable -Wno-long-long -Wno-multichar -Wno-unknown-pragmas
-CXXFLAGS += `wx-config --cxxflags` `sdl-config --cflags`
-LIBS     := `wx-config --libs` `sdl-config --libs`
+CXXFLAGS += `wx-config --version=$(WX_VERSION) --cxxflags` `sdl-config --cflags`
+LIBS     := `wx-config --version=$(WX_VERSION) --libs` `sdl-config --libs`
 INCLUDES := -I.
 CXXFLAGS += $(INCLUDES)
 

Index: wxwindows.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummex/wxwindows.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- wxwindows.cpp	16 Dec 2004 23:44:24 -0000	1.40
+++ wxwindows.cpp	10 Apr 2005 00:36:12 -0000	1.41
@@ -667,6 +667,7 @@
 	EVT_MENU(ID_Dump, MainWindow::BlockDump)
 	EVT_MENU(wxID_HELP, MainWindow::OnHelp)
 	EVT_MENU(ID_FileInfo, MainWindow::FileInfo)
+	EVT_MENU(wxID_EXIT, MainWindow::OnQuit)
 	EVT_TREE_SEL_CHANGING(ID_Tree, MainWindow::OnSelChanged)
 END_EVENT_TABLE()
 
@@ -954,6 +955,11 @@
 	Destroy();
 }
 
+void MainWindow::OnQuit(wxCommandEvent& WXUNUSED(event))
+{
+	Close(true);
+}
+
 void MainWindow::OnSelChanged(wxTreeEvent& event) {
 	wxTreeItemId itemid;
 	int itemtype;

Index: wxwindows.h
===================================================================
RCS file: /cvsroot/scummvm/scummex/wxwindows.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- wxwindows.h	16 Dec 2004 23:44:24 -0000	1.21
+++ wxwindows.h	10 Apr 2005 00:36:12 -0000	1.22
@@ -81,6 +81,7 @@
 	void OnClose(wxCloseEvent& event);
 	void OnHelp(wxCommandEvent& event);
 	void OnSelChanged(wxTreeEvent& event);
+	void OnQuit(wxCommandEvent& event);
 
 	void FileView(wxCommandEvent& event);
 	void FileInfo(wxCommandEvent& event);