Menu
▾
▴
[vba-commit] VisualBoyAdvance/src/gtk sigccompat.h,NONE,1.1 Makefile.am,1.3,1.4 Makefile.in,1.3,1.4 main.cpp,1.2,1.3 system.cpp,1.5,1.6 window.cpp,1.11,1.12 window.h,1.11,1.12
|
From: S?bastien G. <kx...@us...> - 2004-05-01 14:04:11
|
Update of /cvsroot/vba/VisualBoyAdvance/src/gtk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13445/src/gtk Modified Files: Makefile.am Makefile.in main.cpp system.cpp window.cpp window.h Added Files: sigccompat.h Log Message: Added gtkmm 2.4 support. Index: main.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/gtk/main.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** main.cpp 2 Apr 2004 01:22:17 -0000 1.2 --- main.cpp 1 May 2004 14:03:59 -0000 1.3 *************** *** 45,48 **** --- 45,51 ---- { Gtk::MessageDialog oDialog(e.what(), + #ifndef GTKMM20 + false, + #endif // ! GTKMM20 Gtk::MESSAGE_ERROR, Gtk::BUTTONS_CLOSE); Index: Makefile.am =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/gtk/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.am 29 Apr 2004 01:44:35 -0000 1.3 --- Makefile.am 1 May 2004 14:03:58 -0000 1.4 *************** *** 14,17 **** --- 14,18 ---- screenarea.cpp \ screenarea.h \ + sigccompat.h \ system.cpp \ tools.cpp \ *************** *** 26,30 **** -DPKGDATADIR=\"$(pkgdatadir)\" \ -DLOCALEDIR=\"$(datadir)/locale\" \ ! -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" gvba_CXXFLAGS = @GTKMM_CFLAGS@ @SDL_CFLAGS@ --- 27,32 ---- -DPKGDATADIR=\"$(pkgdatadir)\" \ -DLOCALEDIR=\"$(datadir)/locale\" \ ! -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \ ! $(GTKMM_CPPFLAGS) gvba_CXXFLAGS = @GTKMM_CFLAGS@ @SDL_CFLAGS@ Index: system.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/gtk/system.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** system.cpp 25 Apr 2004 19:02:44 -0000 1.5 --- system.cpp 1 May 2004 14:03:59 -0000 1.6 *************** *** 78,81 **** --- 78,84 ---- Gtk::MessageDialog oDialog(*GUI(), csMsg, + #ifndef GTKMM20 + false, + #endif // ! GTKMM20 Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK); Index: window.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/gtk/window.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** window.h 29 Apr 2004 01:44:36 -0000 1.11 --- window.h 1 May 2004 14:04:02 -0000 1.12 *************** *** 23,26 **** --- 23,30 ---- #include <sys/types.h> + #ifndef GTKMM20 + # include "sigccompat.h" + #endif // ! GTKMM20 + #include <libglademm.h> #include <gtkmm.h> Index: window.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/gtk/window.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** window.cpp 29 Apr 2004 01:44:36 -0000 1.11 --- window.cpp 1 May 2004 14:03:59 -0000 1.12 *************** *** 1009,1012 **** --- 1009,1015 ---- Gtk::MessageDialog oDialog(*this, e.what(), + #ifndef GTKMM20 + false, + #endif // ! GTKMM20 Gtk::MESSAGE_ERROR, Gtk::BUTTONS_CLOSE); *************** *** 1025,1028 **** --- 1028,1034 ---- Gtk::MessageDialog oDialog(*this, e.what(), + #ifndef GTKMM20 + false, + #endif // ! GTKMM20 Gtk::MESSAGE_ERROR, Gtk::BUTTONS_CLOSE); Index: Makefile.in =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/gtk/Makefile.in,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.in 29 Apr 2004 01:44:36 -0000 1.3 --- Makefile.in 1 May 2004 14:03:58 -0000 1.4 *************** *** 64,67 **** --- 64,68 ---- GMSGFMT = @GMSGFMT@ GTKMM_CFLAGS = @GTKMM_CFLAGS@ + GTKMM_CPPFLAGS = @GTKMM_CPPFLAGS@ GTKMM_LIBS = @GTKMM_LIBS@ INSTALL_DATA = @INSTALL_DATA@ *************** *** 166,169 **** --- 167,171 ---- screenarea.cpp \ screenarea.h \ + sigccompat.h \ system.cpp \ tools.cpp \ *************** *** 179,183 **** -DPKGDATADIR=\"$(pkgdatadir)\" \ -DLOCALEDIR=\"$(datadir)/locale\" \ ! -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" --- 181,186 ---- -DPKGDATADIR=\"$(pkgdatadir)\" \ -DLOCALEDIR=\"$(datadir)/locale\" \ ! -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \ ! $(GTKMM_CPPFLAGS) --- NEW FILE: sigccompat.h --- // -*- C++ -*- // VisualBoyAdvance - Nintendo Gameboy/GameboyAdvance (TM) emulator. // Copyright (C) 1999-2003 Forgotten // Copyright (C) 2004 Forgotten and the VBA development team // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation; either version 2, or(at your option) // any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software Foundation, // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef __VBA_SIGCCOMPAT_H__ #define __VBA_SIGCCOMPAT_H__ #undef LIBSIGC_DISABLE_DEPRECATED #include <sigc++/bind.h> #include <sigc++/connection.h> #include <sigc++/slot.h> #include <sigc++/object.h> #include <sigc++/functors/mem_fun.h> namespace SigC { template <class T_return, class T_obj1, class T_obj2> inline Slot0<T_return> slot( T_obj1& _A_obj, T_return (T_obj2::*_A_func)() ) { return ::sigc::bound_mem_functor0<T_return, T_obj2> (dynamic_cast< T_obj1&>(_A_obj), _A_func); } template <class T_return, class T_arg1, class T_obj1, class T_obj2> inline Slot1<T_return, T_arg1> slot( T_obj1& _A_obj, T_return (T_obj2::*_A_func)(T_arg1) ) { return ::sigc::bound_mem_functor1<T_return, T_obj2, T_arg1> (dynamic_cast< T_obj1&>(_A_obj), _A_func); } template <class T_return, class T_arg1,class T_arg2, class T_obj1, class T_obj2> inline Slot2<T_return, T_arg1,T_arg2> slot( T_obj1& _A_obj, T_return (T_obj2::*_A_func)(T_arg1,T_arg2) ) { return ::sigc::bound_mem_functor2<T_return, T_obj2, T_arg1,T_arg2> (dynamic_cast< T_obj1&>(_A_obj), _A_func); } } // namespace SigC #endif // __VBA_SIGCCOMPAT_H__ |
