diff --git a/pcsx2/NewGUI/Dialogs/AboutBoxDialog.cpp b/pcsx2/NewGUI/Dialogs/AboutBoxDialog.cpp new file mode 100644 index 0000000000..4e170796b0 --- /dev/null +++ b/pcsx2/NewGUI/Dialogs/AboutBoxDialog.cpp @@ -0,0 +1,30 @@ +/* Pcsx2 - Pc Ps2 Emulator + * Copyright (C) 2002-2009 Pcsx2 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "PrecompiledHeader.h" +#include "Misc.h" +#include "AboutBoxDialog.h" + +namespace Dialogs { + +AboutBoxDialog::AboutBoxDialog( wxWindow* parent, int id ): + wxDialog( parent, id, _T("Game Special Fixes") ) +{ +} + +} // end namespace Dialogs \ No newline at end of file diff --git a/pcsx2/NewGUI/Dialogs/AboutBoxDialog.h b/pcsx2/NewGUI/Dialogs/AboutBoxDialog.h new file mode 100644 index 0000000000..bff9b294e5 --- /dev/null +++ b/pcsx2/NewGUI/Dialogs/AboutBoxDialog.h @@ -0,0 +1,33 @@ +/* Pcsx2 - Pc Ps2 Emulator + * Copyright (C) 2002-2009 Pcsx2 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma once + + +#include +#include + +namespace Dialogs +{ + class AboutBoxDialog: public wxDialog + { + public: + AboutBoxDialog( wxWindow* parent, int id ); + + }; +} diff --git a/pcsx2/NewGUI/Dialogs/GameFixesDialog.h b/pcsx2/NewGUI/Dialogs/GameFixesDialog.h index e606e9804b..7fa3e80136 100644 --- a/pcsx2/NewGUI/Dialogs/GameFixesDialog.h +++ b/pcsx2/NewGUI/Dialogs/GameFixesDialog.h @@ -15,12 +15,12 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ + +#pragma once #include #include -#pragma once - namespace Dialogs { class GameFixesDialog: public wxDialog diff --git a/pcsx2/SourceLog.cpp b/pcsx2/SourceLog.cpp index ac49b3bbac..517514cfac 100644 --- a/pcsx2/SourceLog.cpp +++ b/pcsx2/SourceLog.cpp @@ -101,10 +101,11 @@ static __forceinline void _vSourceLog( u16 protocol, u8 source, u32 cpuPc, u32 c #ifdef PCSX2_DEVBUILD #ifdef _WIN32 // Send log data to the (remote?) debugger. - if (connected && logProtocol<0x10) + // (not supported yet in the wxWidgets port) + /*if (connected && logProtocol<0x10) { sendTTYP(logProtocol, logSource, tmp); - } + }*/ #endif if (varLog.LogToConsole) // log to console enabled? diff --git a/pcsx2/windows/VCprojects/pcsx2_2008.vcproj b/pcsx2/windows/VCprojects/pcsx2_2008.vcproj index d166f7c48f..01f598e390 100644 --- a/pcsx2/windows/VCprojects/pcsx2_2008.vcproj +++ b/pcsx2/windows/VCprojects/pcsx2_2008.vcproj @@ -272,7 +272,7 @@ + + @@ -477,6 +481,7 @@ > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pcsx2/windows/Win32.h b/pcsx2/windows/Win32.h index 27f70ccf20..89192d1a14 100644 --- a/pcsx2/windows/Win32.h +++ b/pcsx2/windows/Win32.h @@ -138,7 +138,6 @@ extern void ExecuteCpu(); extern void OnStates_LoadOther(); extern void OnStates_SaveOther(); extern int ParseCommandLine( int tokenCount, TCHAR *const *const tokens ); -extern void strcatz(char *dst, char *src); extern BOOL CALLBACK PatchBDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam); extern BOOL CALLBACK CpuDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam); diff --git a/pcsx2/windows/WinMain.cpp b/pcsx2/windows/WinMain.cpp index eeb61f8374..4afe262143 100644 --- a/pcsx2/windows/WinMain.cpp +++ b/pcsx2/windows/WinMain.cpp @@ -49,12 +49,6 @@ struct _langs { _langs *langs = NULL; -void strcatz(char *dst, char *src) -{ - int len = strlen(dst) + 1; - strcpy(dst + len, src); -} - //2002-09-20 (Florin) BOOL APIENTRY CmdlineProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);//forward def @@ -1085,45 +1079,3 @@ void CreateMainWindow() SetWindowPos(hWnd, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE); } - -WIN32_FIND_DATA lFindData; -HANDLE lFind; -int lFirst; - -void InitLanguages() { - lFind = FindFirstFile("Langs\\*", &lFindData); - lFirst = 1; -} - -char *GetLanguageNext() { - for (;;) { - if (!strcmp(lFindData.cFileName, ".")) { - if (FindNextFile(lFind, &lFindData) == FALSE) - return NULL; - continue; - } - if (!strcmp(lFindData.cFileName, "..")) { - if (FindNextFile(lFind, &lFindData) == FALSE) - return NULL; - continue; - } - break; - } - if (lFirst == 0) { - if (FindNextFile(lFind, &lFindData) == FALSE) - return NULL; - } else lFirst = 0; - if (lFind==INVALID_HANDLE_VALUE) return NULL; - - return lFindData.cFileName; -} - -void CloseLanguages() { - if (lFind!=INVALID_HANDLE_VALUE) FindClose(lFind); -} - -void ChangeLanguage(char *lang) { - strcpy_s(Config.Lang, lang); - SaveConfig(); - LoadConfig(); -} diff --git a/pcsx2/windows/WinSysExec.cpp b/pcsx2/windows/WinSysExec.cpp index a683079035..57f8b89967 100644 --- a/pcsx2/windows/WinSysExec.cpp +++ b/pcsx2/windows/WinSysExec.cpp @@ -157,6 +157,13 @@ void SysPrintf(const char *fmt, ...) Console::Write( msg ); } +static void strcatz(char *dst, char *src) +{ + int len = strlen(dst) + 1; + strcpy(dst + len, src); +} + + void OnStates_LoadOther() { OPENFILENAME ofn; diff --git a/pcsx2/windows/gnuLanguages.cpp b/pcsx2/windows/gnuLanguages.cpp new file mode 100644 index 0000000000..eca4f1fb0e --- /dev/null +++ b/pcsx2/windows/gnuLanguages.cpp @@ -0,0 +1,64 @@ +/* Pcsx2 - Pc Ps2 Emulator + * Copyright (C) 2002-2009 Pcsx2 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "PrecompiledHeader.h" +#include "win32.h" + +// Antiquated gnu gettext version of languaging. I'm going to make my own --air + +WIN32_FIND_DATA lFindData; +HANDLE lFind; +int lFirst; + +void InitLanguages() { + lFind = FindFirstFile("Langs\\*", &lFindData); + lFirst = 1; +} + +char *GetLanguageNext() { + for (;;) { + if (!strcmp(lFindData.cFileName, ".")) { + if (FindNextFile(lFind, &lFindData) == FALSE) + return NULL; + continue; + } + if (!strcmp(lFindData.cFileName, "..")) { + if (FindNextFile(lFind, &lFindData) == FALSE) + return NULL; + continue; + } + break; + } + if (lFirst == 0) { + if (FindNextFile(lFind, &lFindData) == FALSE) + return NULL; + } else lFirst = 0; + if (lFind==INVALID_HANDLE_VALUE) return NULL; + + return lFindData.cFileName; +} + +void CloseLanguages() { + if (lFind!=INVALID_HANDLE_VALUE) FindClose(lFind); +} + +void ChangeLanguage(char *lang) { + strcpy_s(Config.Lang, lang); + SaveConfig(); + LoadConfig(); +}