From e1c33ce08a36ae27ac82aa26f29830d0391de2cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Benjamim?= Date: Mon, 17 Mar 2014 13:29:27 +0100 Subject: [PATCH 1/2] pouar patch - this patch allows r1206 and up to compile (at least for wxvbam anyway) --- trunk/src/Util.cpp | 1 - trunk/src/Util.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/trunk/src/Util.cpp b/trunk/src/Util.cpp index 25f3df4b..937f4452 100644 --- a/trunk/src/Util.cpp +++ b/trunk/src/Util.cpp @@ -439,7 +439,6 @@ static bool utilIsImage(const char *file) #include #endif -IMAGE_TYPE utilFindType(const char *file, char (&buffer)[2048]); IMAGE_TYPE utilFindType(const char *file) { diff --git a/trunk/src/Util.h b/trunk/src/Util.h index 1292b85f..d54560a0 100644 --- a/trunk/src/Util.h +++ b/trunk/src/Util.h @@ -23,6 +23,7 @@ bool utilIsGzipFile(const char *); bool utilIsZipFile(const char *); void utilStripDoubleExtension(const char *, char *); IMAGE_TYPE utilFindType(const char *); +IMAGE_TYPE utilFindType(const char *file, char (&buffer)[2048]); uint8_t *utilLoad(const char *, bool (*)(const char*), uint8_t *, int &); void utilPutDword(uint8_t *, uint32_t); From d83382cbc576e313855818d21db516381dcccec7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Benjamim?= Date: Mon, 17 Mar 2014 15:06:01 +0100 Subject: [PATCH 2/2] changed copyright year to 2014 (VBA-M development team) --- trunk/po/wxvbam/cs.po | 4 ++-- trunk/po/wxvbam/en.po | 4 ++-- trunk/po/wxvbam/nl.po | 2 +- trunk/po/wxvbam/wxvbam.pot | 2 +- trunk/po/wxvbam/zh_TW.po | 4 ++-- trunk/src/gtk/windowcallbacks.cpp | 2 +- trunk/src/wx/cmdevents.cpp | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/trunk/po/wxvbam/cs.po b/trunk/po/wxvbam/cs.po index e8fe186c..a72e96b8 100644 --- a/trunk/po/wxvbam/cs.po +++ b/trunk/po/wxvbam/cs.po @@ -371,8 +371,8 @@ msgstr "Nintendo GameBoy (+Color+Advance) emulátor." msgid "" "Copyright (C) 1999-2003 Forgotten\n" "Copyright (C) 2004-2006 VBA development team\n" -"Copyright (C) 2007-2011 VBA-M development team" -msgstr "Copyright (C) 1999-2003 Forgotten\nCopyright (C) 2004-2006 VBA development team\nCopyright (C) 2007-2011 VBA-M development team" +"Copyright (C) 2007-2014 VBA-M development team" +msgstr "Copyright (C) 1999-2003 Forgotten\nCopyright (C) 2004-2006 VBA development team\nCopyright (C) 2007-2014 VBA-M development team" #: ../src/wx/cmdevents.cpp:2180 msgid "" diff --git a/trunk/po/wxvbam/en.po b/trunk/po/wxvbam/en.po index 37f81d46..f396dea6 100644 --- a/trunk/po/wxvbam/en.po +++ b/trunk/po/wxvbam/en.po @@ -1196,11 +1196,11 @@ msgstr "Connecting to %s\n" msgid "" "Copyright (C) 1999-2003 Forgotten\n" "Copyright (C) 2004-2006 VBA development team\n" -"Copyright (C) 2007-2011 VBA-M development team" +"Copyright (C) 2007-2014 VBA-M development team" msgstr "" "Copyright (C) 1999-2003 Forgotten\n" "Copyright (C) 2004-2006 VBA development team\n" -"Copyright (C) 2007-2011 VBA-M development team" +"Copyright (C) 2007-2014 VBA-M development team" #: ../src/wx/wxvbam.cpp:208 msgid "Could not create main window" diff --git a/trunk/po/wxvbam/nl.po b/trunk/po/wxvbam/nl.po index f877e58f..be782feb 100644 --- a/trunk/po/wxvbam/nl.po +++ b/trunk/po/wxvbam/nl.po @@ -370,7 +370,7 @@ msgstr "" msgid "" "Copyright (C) 1999-2003 Forgotten\n" "Copyright (C) 2004-2006 VBA development team\n" -"Copyright (C) 2007-2011 VBA-M development team" +"Copyright (C) 2007-2014 VBA-M development team" msgstr "" #: ../src/wx/cmdevents.cpp:2180 diff --git a/trunk/po/wxvbam/wxvbam.pot b/trunk/po/wxvbam/wxvbam.pot index 62822380..2002f5a6 100644 --- a/trunk/po/wxvbam/wxvbam.pot +++ b/trunk/po/wxvbam/wxvbam.pot @@ -368,7 +368,7 @@ msgstr "" msgid "" "Copyright (C) 1999-2003 Forgotten\n" "Copyright (C) 2004-2006 VBA development team\n" -"Copyright (C) 2007-2011 VBA-M development team" +"Copyright (C) 2007-2014 VBA-M development team" msgstr "" #: ../src/wx/cmdevents.cpp:2180 diff --git a/trunk/po/wxvbam/zh_TW.po b/trunk/po/wxvbam/zh_TW.po index 8169a28d..64ff3e9b 100644 --- a/trunk/po/wxvbam/zh_TW.po +++ b/trunk/po/wxvbam/zh_TW.po @@ -370,8 +370,8 @@ msgstr "Nintendo GameBoy (+Color+Advance) emulator." msgid "" "Copyright (C) 1999-2003 Forgotten\n" "Copyright (C) 2004-2006 VBA development team\n" -"Copyright (C) 2007-2011 VBA-M development team" -msgstr "Copyright (C) 1999-2003 Forgotten\nCopyright (C) 2004-2006 VBA development team\nCopyright (C) 2007-2011 VBA-M development team" +"Copyright (C) 2007-2014 VBA-M development team" +msgstr "Copyright (C) 1999-2003 Forgotten\nCopyright (C) 2004-2006 VBA development team\nCopyright (C) 2007-2014 VBA-M development team" #: ../src/wx/cmdevents.cpp:2180 msgid "" diff --git a/trunk/src/gtk/windowcallbacks.cpp b/trunk/src/gtk/windowcallbacks.cpp index 9396b99a..c8ac67c7 100644 --- a/trunk/src/gtk/windowcallbacks.cpp +++ b/trunk/src/gtk/windowcallbacks.cpp @@ -500,7 +500,7 @@ void Window::vOnHelpAbout() "along with this program. If not, see ."; const char csCopyright[] = "Copyright (C) 1999-2003 Forgotten\n" "Copyright (C) 2004-2006 VBA development team\n" - "Copyright (C) 2007-2011 VBA-M development team"; + "Copyright (C) 2007-2014 VBA-M development team"; oAboutDialog.set_transient_for(*this); diff --git a/trunk/src/wx/cmdevents.cpp b/trunk/src/wx/cmdevents.cpp index 90fe5896..16ab5f0e 100644 --- a/trunk/src/wx/cmdevents.cpp +++ b/trunk/src/wx/cmdevents.cpp @@ -2176,7 +2176,7 @@ EVT_HANDLER(wxID_ABOUT, "About...") ai.SetWebSite(wxT("http://www.vba-m.com/")); ai.SetIcon(GetIcon()); ai.SetDescription(_("Nintendo GameBoy (+Color+Advance) emulator.")); - ai.SetCopyright(_("Copyright (C) 1999-2003 Forgotten\nCopyright (C) 2004-2006 VBA development team\nCopyright (C) 2007-2011 VBA-M development team")); + ai.SetCopyright(_("Copyright (C) 1999-2003 Forgotten\nCopyright (C) 2004-2006 VBA development team\nCopyright (C) 2007-2014 VBA-M development team")); ai.SetLicense(_("This program is free software: you can redistribute it and/or modify\n" "it under the terms of the GNU General Public License as published by\n" "the Free Software Foundation, either version 2 of the License, or\n"