ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wxgui: The Linux side compiles and runs again. Note: Removed "Open in Explorer" buttons for folders since there seems no reliable way to do that in Linux. 

git-svn-id: http://pcsx2.googlecode.com/svn/branches/wxgui@1661 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2009-08-20 23:05:26 +00:00
parent e25db2a0ba
commit db3e81504e
27 changed files with 560 additions and 519 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/build/Utilities/Utilities.cbp
View File

@ -67,10 +67,12 @@
<Unit filename="../../include/Utilities/MemcpyFast.h" />
<Unit filename="../../include/Utilities/RedtapeWindows.h" />
<Unit filename="../../include/Utilities/SafeArray.h" />
<Unit filename="../../include/Utilities/ScopedPtr.h" />
<Unit filename="../../include/Utilities/StringHelpers.h" />
<Unit filename="../../include/Utilities/Threading.h" />
<Unit filename="../../include/Utilities/lnx_memzero.h" />
<Unit filename="../../include/Utilities/win_memzero.h" />
<Unit filename="../../include/Utilities/wxBaseTools.h" />
<Unit filename="../../include/Utilities/wxGuiTools.h" />
<Unit filename="../../include/intrin_x86.h" />
<Unit filename="../../src/Utilities/AlignedMalloc.cpp" />
<Unit filename="../../src/Utilities/Console.cpp" />

7
common/include/Utilities/Threading.h
View File

@ -158,12 +158,7 @@ namespace Threading
public:
// performs a test on the given thread handle, returning true if the thread exists
// or false if the thread is dead/done/never existed.
static bool Exists( pthread_t pid )
{
// passing 0 to pthread_kill is a NOP, and returns the status of the thread only.
return ( ESRCH != pthread_kill( pid, 0 ) );
}
static bool Exists( pthread_t pid );
};
//////////////////////////////////////////////////////////////////////////////////////////

10
common/src/Utilities/ThreadTools.cpp
View File

@ -19,6 +19,10 @@
#include "PrecompiledHeader.h"
#include "Threading.h"
#ifdef __LINUX__
# include <signal.h> // for pthread_kill, which is in pthread.h on w32-pthreads
#endif
using namespace Threading;
namespace Threading
@ -84,6 +88,12 @@ namespace Threading
return m_returncode;
}
bool Exists( pthread_t pid )
{
// passing 0 to pthread_kill is a NOP, and returns the status of the thread only.
return ( ESRCH != pthread_kill( pid, 0 ) );
}
bool PersistentThread::IsRunning() const
{
return ( m_running && (ESRCH != pthread_kill( m_thread, 0 )) );

2
common/src/Utilities/x86/MemcpyFast.cpp
View File

@ -31,7 +31,7 @@
3dsdk.support@amd.com
******************************************************************************/
#include "..\PrecompiledHeader.h"
#include "../PrecompiledHeader.h"
#ifdef _MSC_VER
#pragma warning(disable:4414)

2
pcsx2/CDVD/CDVD.cpp
View File

@ -25,7 +25,7 @@
#include "IsoFStools.h"
#include "CDVD_internal.h"
#include "CDVDisoReader.h"
#include "gs.h" // for gsRegionMode
#include "GS.h" // for gsRegionMode
#include "ps2/BiosTools.h"
#include "AppConfig.h"

17
pcsx2/CDVD/IsoFileTools.cpp
View File

@ -71,7 +71,7 @@ int _readfile(void *handle, void *dst, int size)
return ret;
}
int _writefile(void *handle, void *src, int size)
int _writefile(void *handle, const void *src, int size)
{
DWORD ret;
@ -100,12 +100,13 @@ void *_openfile(const char *filename, int flags)
u64 _tellfile(void *handle)
{
s64 cursize = ftell(handle);
FILE* fp = (FILE*)handle;
s64 cursize = ftell(fp);
if (cursize == -1)
{
// try 64bit
cursize = ftello64(handle);
cursize = ftello64(fp);
if (cursize < -1)
{
// zero top 32 bits
@ -117,7 +118,7 @@ u64 _tellfile(void *handle)
int _seekfile(void *handle, u64 offset, int whence)
{
int seekerr = fseeko64(handle, offset, whence);
int seekerr = fseeko64((FILE*)handle, offset, whence);
if (seekerr == -1) Console::Error("Failed to seek.");
@ -126,17 +127,17 @@ int _seekfile(void *handle, u64 offset, int whence)
int _readfile(void *handle, void *dst, int size)
{
return fread(dst, 1, size, handle);
return fread(dst, 1, size, (FILE*)handle);
}
int _writefile(void *handle, void *src, int size)
int _writefile(void *handle, const void *src, int size)
{
return fwrite(src, 1, size, handle);
return fwrite(src, 1, size, (FILE*)handle);
}
void _closefile(void *handle)
{
fclose(handle);
fclose((FILE*)handle);
}
#endif

21
pcsx2/CDVD/IsoFileTools.h
View File

@ -16,8 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef __ISO_FILE_TOOLS_H__
#define __ISO_FILE_TOOLS_H__
#pragma once
#ifndef _LARGEFILE_SOURCE
#define _LARGEFILE_SOURCE
@ -27,11 +26,14 @@
#define _LARGEFILE64_SOURCE
#endif
#ifndef __USE_FILE_OFFSET64
#define __USE_FILE_OFFSET64
#endif
#define _FILE_OFFSET_BITS 64
#ifdef _MSC_VER
#pragma warning(disable:4018)
# pragma warning(disable:4018) // disable signed/unsigned mismatch error
#endif
#include "IopCommon.h"
@ -40,11 +42,10 @@
#include <fcntl.h>
#include <errno.h>
void *_openfile(const char *filename, int flags);
u64 _tellfile(void *handle);
int _seekfile(void *handle, u64 offset, int whence);
int _readfile(void *handle, void *dst, int size);
int _writefile(void *handle, void *src, int size);
void _closefile(void *handle);
extern void *_openfile(const char *filename, int flags);
extern u64 _tellfile(void *handle);
extern int _seekfile(void *handle, u64 offset, int whence);
extern int _readfile(void *handle, void *dst, int size);
extern int _writefile(void *handle, const void *src, int size);
extern void _closefile(void *handle);
#endif

31
pcsx2/Linux/pcsx2.cbp
View File

@ -109,16 +109,31 @@
<Unit filename="../../common/include/Pcsx2Config.h" />
<Unit filename="../../common/include/Pcsx2Defs.h" />
<Unit filename="../../common/include/Pcsx2Types.h" />
<Unit filename="../../common/include/wx/folderdesc.txt" />
<Unit filename="../../common/include/wx/scopedarray.h" />
<Unit filename="../../common/include/wx/scopedptr.h" />
<Unit filename="../CDVD/CDVD.cpp" />
<Unit filename="../CDVD/CDVD.h" />
<Unit filename="../CDVD/CDVD_internal.h" />
<Unit filename="../CDVD/CDVDiso.cpp" />
<Unit filename="../CDVD/CDVDaccess.cpp" />
<Unit filename="../CDVD/CDVDaccess.h" />
<Unit filename="../CDVD/CDVDiso.h" />
<Unit filename="../CDVD/CDVDisodrv.cpp" />
<Unit filename="../CDVD/CDVDisoReader.cpp" />
<Unit filename="../CDVD/CDVDisoReader.h" />
<Unit filename="../CDVD/CDVDisodrv.h" />
<Unit filename="../CDVD/CDVDlib.h" />
<Unit filename="../CDVD/CdRom.cpp" />
<Unit filename="../CDVD/CdRom.h" />
<Unit filename="../CDVD/IsoFScdvd.h" />
<Unit filename="../CDVD/IsoFSdrv.cpp" />
<Unit filename="../CDVD/IsoFSdrv.h" />
<Unit filename="../CDVD/IsoFStools.cpp" />
<Unit filename="../CDVD/IsoFStools.h" />
<Unit filename="../CDVD/IsoFileFormats.cpp" />
<Unit filename="../CDVD/IsoFileFormats.h" />
<Unit filename="../CDVD/IsoFileTools.cpp" />
<Unit filename="../CDVD/IsoFileTools.h" />
<Unit filename="../CDVD/IsoFileTools.h.save" />
<Unit filename="../CDVD/Makefile.am" />
<Unit filename="../COP0.cpp" />
<Unit filename="../COP2.cpp" />
@ -199,6 +214,7 @@
<Unit filename="../Patch.h" />
<Unit filename="../PathUtils.cpp" />
<Unit filename="../Paths.h" />
<Unit filename="../Pcsx2Config.cpp" />
<Unit filename="../Plugins.cpp" />
<Unit filename="../Plugins.h" />
<Unit filename="../PrecompiledHeader.h" />
@ -253,12 +269,15 @@
<Unit filename="../gui/AdvancedDialog.h" />
<Unit filename="../gui/App.h" />
<Unit filename="../gui/AppConfig.cpp" />
<Unit filename="../gui/AppConfig.h" />
<Unit filename="../gui/CheckedStaticBox.cpp" />
<Unit filename="../gui/CheckedStaticBox.h" />
<Unit filename="../gui/ConsoleLogger.cpp" />
<Unit filename="../gui/Dialogs/AboutBoxDialog.cpp" />
<Unit filename="../gui/Dialogs/ConfigurationDialog.cpp" />
<Unit filename="../gui/Dialogs/ConfigurationDialog.h" />
<Unit filename="../gui/Dialogs/FirstTimeWizard.cpp" />
<Unit filename="../gui/Dialogs/ImportSettingsDialog.cpp" />
<Unit filename="../gui/Dialogs/LogOptionsDialog.cpp" />
<Unit filename="../gui/Dialogs/LogOptionsDialog.h" />
<Unit filename="../gui/Dialogs/ModalPopups.h" />
@ -268,10 +287,14 @@
<Unit filename="../gui/IniInterface.h" />
<Unit filename="../gui/MainFrame.cpp" />
<Unit filename="../gui/MainFrame.h" />
<Unit filename="../gui/MainMenuClicks.cpp" />
<Unit filename="../gui/Panels/AudioPanel.cpp" />
<Unit filename="../gui/Panels/BiosSelectorPanel.cpp" />
<Unit filename="../gui/Panels/ConfigurationPanels.h" />
<Unit filename="../gui/Panels/CpuPanel.cpp" />
<Unit filename="../gui/Panels/DirPickerPanel.cpp" />
<Unit filename="../gui/Panels/GameFixesPanel.cpp" />
<Unit filename="../gui/Panels/MiscPanelStuff.cpp" />
<Unit filename="../gui/Panels/PathsPanel.cpp" />
<Unit filename="../gui/Panels/PluginSelectorPanel.cpp" />
<Unit filename="../gui/Panels/SpeedhacksPanel.cpp" />
@ -292,6 +315,10 @@
<Unit filename="../gui/wxHelpers.cpp" />
<Unit filename="../gui/wxHelpers.h" />
<Unit filename="../pcsxAbout.bmp" />
<Unit filename="../ps2/BiosTools.cpp" />
<Unit filename="../ps2/BiosTools.h" />
<Unit filename="../ps2/CoreEmuThread.cpp" />
<Unit filename="../ps2/CoreEmuThread.h" />
<Unit filename="../ps2/Iop/IopHwRead.cpp" />
<Unit filename="../ps2/Iop/IopHwWrite.cpp" />
<Unit filename="../ps2/Iop/IopHw_Internal.h" />

3
pcsx2/Plugins.cpp
View File

@ -47,7 +47,7 @@ const PluginInfo tbl_PluginInfo[] =
};
int EnumeratePluginsInFolder( wxDirName& searchpath, wxArrayString* dest )
int EnumeratePluginsInFolder( const wxDirName& searchpath, wxArrayString* dest )
{
wxScopedPtr<wxArrayString> placebo;
wxArrayString* realdest = dest;
@ -557,7 +557,6 @@ Exception::NotPcsxPlugin::NotPcsxPlugin( const PluginsEnum_t& pid ) :
void PluginManager::BindCommon( PluginsEnum_t pid )
{
const LegacyApi_CommonMethod* current = s_MethMessCommon;
int fid = 0; // function id
VoidMethod** target = (VoidMethod**)&m_CommonBindings[pid];
while( current->MethodName != NULL )

2
pcsx2/Plugins.h
View File

@ -109,7 +109,7 @@ protected:
extern const PluginInfo tbl_PluginInfo[];
extern PluginManager* g_plugins;
extern int EnumeratePluginsInFolder( wxDirName& searchPath, wxArrayString* dest );
extern int EnumeratePluginsInFolder( const wxDirName& searchPath, wxArrayString* dest );
void LoadPlugins();

2
pcsx2/System.h
View File

@ -53,6 +53,8 @@ extern void vSyncDebugStuff( uint frame );
#ifdef __LINUX__
# include <signal.h>
extern void SysPageFaultExceptionFilter( int signal, siginfo_t *info, void * );
extern void __fastcall InstallLinuxExceptionHandler();
extern void __fastcall ReleaseLinuxExceptionHandler();

2
pcsx2/Tags.h
View File

@ -256,7 +256,7 @@ namespace CHCR
u8 num_addr = ASP(tag);
TransferMode mode = MOD(tag);
Console::Write("%s chcr %s mem: ", params s, (DIR(tag)) ? "from" : "to");
Console::Write("%s chcr %s mem: ", params s, CHCR::DIR(tag) ? "from" : "to");
if (mode == NORMAL_MODE)
Console::Write(" normal mode; ");

2
pcsx2/gui/AppConfig.cpp
View File

@ -255,7 +255,7 @@ namespace FilenameDefs
wxFileName GetUsermodeConfig()
{
return L"usermode.ini";
return wxFileName( L"usermode.ini" );
}
const wxFileName& Memcard( int slot )

13
pcsx2/gui/Dialogs/FirstTimeWizard.cpp
View File

@ -53,10 +53,9 @@ Panels::SettingsDirPickerPanel::SettingsDirPickerPanel( wxWindow* parent ) :
), wxSizerFlags().Expand().Border( wxBOTTOM, 6 )
);
SetSizerAndFit( GetSizer(), false );
//SetSizerAndFit( GetSizer(), false );
}
// ----------------------------------------------------------------------------
FirstTimeWizard::UsermodePage::UsermodePage( wxWizard* parent ) :
wxWizardPageSimple( (g_ApplyState.SetCurrentPage( 0 ), parent) )
@ -64,7 +63,6 @@ FirstTimeWizard::UsermodePage::UsermodePage( wxWizard* parent ) :
, m_dirpick_settings( *new SettingsDirPickerPanel( this ) )
, m_panel_LangSel( *new LanguageSelectionPanel( *this, 608 ) )
, m_panel_UserSel( *new UsermodeSelectionPanel( *this, 608 ) )
{
wxBoxSizer& usermodeSizer( *new wxBoxSizer( wxVERTICAL ) );
AddStaticTextTo( this, usermodeSizer, _("PCSX2 is starting from a new or unknown folder and needs to be configured.") );
@ -74,7 +72,7 @@ FirstTimeWizard::UsermodePage::UsermodePage( wxWizard* parent ) :
usermodeSizer.AddSpacer( 6 );
usermodeSizer.Add( &m_dirpick_settings, SizerFlags::SubGroup() );
SetSizerAndFit( &usermodeSizer );
SetSizer( &usermodeSizer );
Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler(FirstTimeWizard::UsermodePage::OnUsermodeChanged) );
}
@ -102,7 +100,12 @@ FirstTimeWizard::FirstTimeWizard( wxWindow* parent ) :
// Page 2 - Plugins Panel
wxBoxSizer& pluginSizer( *new wxBoxSizer( wxVERTICAL ) );
pluginSizer.Add( &m_panel_PluginSel, SizerFlags::StdExpand() );
m_page_plugins.SetSizerAndFit( &pluginSizer );
m_page_plugins.SetSizer( &pluginSizer );
// Page 3 - Bios Panel
wxBoxSizer& biosSizer( *new wxBoxSizer( wxVERTICAL ) );
biosSizer.Add( &m_panel_BiosSel, SizerFlags::StdExpand() );
m_page_bios.SetSizer( &biosSizer );
// Assign page indexes as client data
m_page_usermode.SetClientData ( (void*)0 );

2
pcsx2/gui/HostGui.cpp
View File

@ -17,7 +17,7 @@
*/
#include "PrecompiledHeader.h"
#include "Mainframe.h"
#include "MainFrame.h"
// This API is likely obsolete for the most part, so I've just included a few dummies
// to keep things compiling until I can get to the point of tying up loose ends.

2
pcsx2/gui/MainFrame.cpp
View File

@ -293,7 +293,7 @@ MainEmuFrame::MainEmuFrame(wxWindow* parent, const wxString& title):
// ------------------------------------------------------------------------
m_menuConfig.Append(Menu_Config_Settings, _("Settings") );
m_menuConfig.Append(Menu_Config_Settings, _("General Settings") );
m_menuConfig.AppendSeparator();
// Query installed "tertiary" plugins for name and menu options.

13
pcsx2/gui/Panels/BiosSelectorPanel.cpp
View File

@ -66,7 +66,7 @@ void Panels::BaseSelectorPanel::OnFolderChanged( wxFileDirPickerEvent& evt )
// ----------------------------------------------------------------------------
Panels::BiosSelectorPanel::BiosSelectorPanel( wxWindow& parent, int idealWidth ) :
BaseSelectorPanel( parent, idealWidth-9 )
BaseSelectorPanel( parent, idealWidth-12 )
, m_ComboBox( *new wxListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE | wxLB_SORT | wxLB_NEEDED_SB ) )
, m_FolderPicker( *new DirPickerPanel( this, FolderId_Bios,
_("BIOS Search Path:"), // static box label
@ -77,16 +77,15 @@ Panels::BiosSelectorPanel::BiosSelectorPanel( wxWindow& parent, int idealWidth )
m_ComboBox.SetFont( wxFont( m_ComboBox.GetFont().GetPointSize()+1, wxFONTFAMILY_MODERN, wxNORMAL, wxNORMAL, false, L"Lucida Console" ) );
m_ComboBox.SetMinSize( wxSize( wxDefaultCoord, std::max( m_ComboBox.GetMinSize().GetHeight(), 96 ) ) );
m_FolderPicker.SetStaticDesc( _("Click the Browse button to select a different folder where PCSX2 will look for PS2 BIOS roms.") );
wxBoxSizer& sizer( *new wxBoxSizer( wxVERTICAL ) );
AddStaticText( sizer, _("Select a BIOS rom:"), wxALIGN_LEFT );
sizer.Add( &m_ComboBox, SizerFlags::StdExpand() );
sizer.AddSpacer( 6 );
m_FolderPicker.SetStaticDesc( _("Click the Browse button to select a different folder where PCSX2 will look for PS2 BIOS roms.") );
sizer.Add( &m_FolderPicker, SizerFlags::StdExpand() );
SetSizerAndFit( &sizer );
SetSizer( &sizer );
}
Panels::BiosSelectorPanel::~BiosSelectorPanel()
@ -125,8 +124,8 @@ void Panels::BiosSelectorPanel::Apply( AppConfig& conf )
// Translated
pxE( ".Popup Error:Invalid BIOS Selection",
L"Please select a valid BIOS before applying new settings. If you are unable to make\n"
L"a valid selection then press cancel to close the Configuration panel."
L"Please select a valid BIOS. If you are unable to make a valid selection "
L"then press cancel to close the Configuration panel."
)
);
}

19
pcsx2/gui/Panels/DirPickerPanel.cpp
View File

@ -87,7 +87,7 @@ Panels::DirPickerPanel::DirPickerPanel( wxWindow* parent, FoldersEnum_t folderid
if( !wxDir::Exists( normalized ) )
wxMkdir( normalized );
m_pickerCtrl = new wxDirPickerCtrl( this, wxID_ANY, normalized, dialogLabel,
m_pickerCtrl = new wxDirPickerCtrl( this, wxID_ANY, wxEmptyString, dialogLabel,
wxDefaultPosition, wxDefaultSize, wxDIRP_USE_TEXTCTRL | wxDIRP_DIR_MUST_EXIST
);
@ -99,12 +99,19 @@ Panels::DirPickerPanel::DirPickerPanel( wxWindow* parent, FoldersEnum_t folderid
L"" )
);
#ifndef __WXGTK__
// GTK+ : The wx implementation of Explore isn't reliable, so let's not even put the
// button on the dialogs for now.
wxButton* b_explore( new wxButton( this, wxID_ANY, _("Open in Explorer") ) );
b_explore->SetToolTip( _("Open an explorer window to this folder.") );
s_lower.Add( b_explore, SizerFlags::StdButton().Align( wxALIGN_RIGHT ) );
Connect( b_explore->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DirPickerPanel::Explore_Click ) );
#endif
s_box.Add( &s_lower, wxSizerFlags().Expand() );
SetSizerAndFit( &s_box );
SetSizer( &s_box );
// Apply default values
const bool isDefault = g_Conf->Folders.IsDefault( m_FolderId );
@ -112,13 +119,17 @@ Panels::DirPickerPanel::DirPickerPanel( wxWindow* parent, FoldersEnum_t folderid
m_pickerCtrl->Enable( !isDefault );
Connect( m_checkCtrl->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DirPickerPanel::UseDefaultPath_Click ) );
Connect( b_explore->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DirPickerPanel::Explore_Click ) );
// Finally, assign the real value from the config.
// (done here because wxGTK fails to init the control when provisioning the initial path
// via the contructor)
m_pickerCtrl->SetPath( GetNormalizedConfigFolder( m_FolderId ) );
}
Panels::DirPickerPanel& Panels::DirPickerPanel::SetStaticDesc( const wxString& msg )
{
InsertStaticTextAt( this, *GetSizer(), 0, msg );
SetSizerAndFit( GetSizer(), false );
//SetSizer( GetSizer(), false );
return *this;
}

2
pcsx2/gui/Panels/GameFixesPanel.cpp
View File

@ -41,7 +41,7 @@ Panels::GameFixesPanel::GameFixesPanel( wxWindow& parent, int idealWidth ) :
L"will need to turn off fixes manually when changing games."
));
SetSizerAndFit( &mainSizer );
SetSizer( &mainSizer );
}

4
pcsx2/gui/Panels/MiscPanelStuff.cpp
View File

@ -132,7 +132,7 @@ Panels::UsermodeSelectionPanel::UsermodeSelectionPanel( wxWindow& parent, int id
_("This setting requires administration privlidges from your operating system.") );
s_boxer.AddSpacer( 4 );
SetSizerAndFit( &s_boxer );
SetSizer( &s_boxer );
}
void Panels::UsermodeSelectionPanel::Apply( AppConfig& conf )
@ -172,7 +172,7 @@ Panels::LanguageSelectionPanel::LanguageSelectionPanel( wxWindow& parent, int id
s_lang.AddSpacer( 5 );
s_lang.Add( m_picker, SizerFlags::StdSpace() );
SetSizerAndFit( &s_lang );
SetSizer( &s_lang );
}
void Panels::LanguageSelectionPanel::Apply( AppConfig& conf )

2
pcsx2/gui/Panels/PathsPanel.cpp
View File

@ -80,6 +80,6 @@ Panels::StandardPathsPanel::StandardPathsPanel( wxWindow& parent ) :
) );
s_main.AddSpacer( 5 );
SetSizerAndFit( &s_main );
SetSizer( &s_main );
}

18
pcsx2/gui/Panels/PluginSelectorPanel.cpp
View File

@ -133,7 +133,7 @@ Panels::PluginSelectorPanel::StatusPanel::StatusPanel( wxWindow* parent ) :
s_main.Add( &m_gauge, wxSizerFlags().Expand().Border( wxLEFT | wxRIGHT, 32 ) );
s_main.Add( &m_label, SizerFlags::StdExpand() );
SetSizerAndFit( &s_main );
SetSizer( &s_main );
}
void Panels::PluginSelectorPanel::StatusPanel::SetGaugeLength( int len )
@ -185,13 +185,17 @@ Panels::PluginSelectorPanel::ComboBoxPanel::ComboBoxPanel( PluginSelectorPanel*
s_main.AddSpacer( 6 );
s_main.Add( &m_FolderPicker, SizerFlags::StdExpand() );
SetSizerAndFit( &s_main );
SetSizer( &s_main );
}
void Panels::PluginSelectorPanel::ComboBoxPanel::Reset()
{
for( int i=0; i<NumPluginTypes; ++i )
{
m_combobox[i]->Clear();
m_combobox[i]->SetSelection( wxNOT_FOUND );
m_combobox[i]->SetValue( wxEmptyString );
}
}
// ------------------------------------------------------------------------
@ -216,7 +220,7 @@ Panels::PluginSelectorPanel::PluginSelectorPanel( wxWindow& parent, int idealWid
//s_main.Add( refresh );
//Connect( refresh->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PluginSelectorPanel::OnRefresh ) );
SetSizerAndFit( &s_main );
SetSizer( &s_main );
Connect( wxEVT_EnumeratedNext, wxCommandEventHandler( PluginSelectorPanel::OnProgress ) );
Connect( wxEVT_EnumerationFinished, wxCommandEventHandler( PluginSelectorPanel::OnEnumComplete ) );
@ -322,14 +326,6 @@ void Panels::PluginSelectorPanel::OnEnumComplete( wxCommandEvent& evt )
m_ComponentBoxes.Get(i).SetSelection( 0 );
}
/*if( emptyBoxes > 0 )
{
Msgbox::Alert( pxE( ".Popup Error:Missing Plugins",
L"Critical Error: A valid plugin for one or more components of PCSX2 could not be found.\n"
L"If this is a fresh install of PCSX2 then your installation may be corrupted or incomplete.\n")
);
}*/
m_ComponentBoxes.Show();
m_StatusPanel.Hide();
m_StatusPanel.Reset();

2
pcsx2/gui/Panels/SpeedhacksPanel.cpp
View File

@ -184,7 +184,7 @@ Panels::SpeedHacksPanel::SpeedHacksPanel( wxWindow& parent, int idealWidth ) :
mainSizer.Add( &cycleHacksSizer, wxSizerFlags().Expand() );
mainSizer.Add( &miscSizer, SizerFlags::TopLevelBox() );
SetSizerAndFit( &mainSizer );
SetSizer( &mainSizer );
Connect( m_slider_eecycle->GetId(), wxEVT_SCROLL_CHANGED, wxScrollEventHandler( SpeedHacksPanel::EECycleRate_Scroll ) );
Connect( m_slider_vustealer->GetId(), wxEVT_SCROLL_CHANGED, wxScrollEventHandler( SpeedHacksPanel::VUCycleRate_Scroll ) );

1
pcsx2/gui/main.cpp
View File

@ -166,7 +166,6 @@ bool Pcsx2App::OnInit()
m_Ps2ConLogBox = m_ProgramLogBox; // just use a single logger for now.
//m_Ps2ConLogBox = new ConsoleLogFrame( NULL, L"PS2 Console Log" );
SetTopWindow( m_MainFrame ); // not really needed...
SetExitOnFrameDelete( true ); // but being explicit doesn't hurt...
m_MainFrame->Show();

15
pcsx2/gui/wxHelpers.cpp
View File

@ -200,9 +200,7 @@ namespace wxHelpers
//
void Launch( const wxString& filename )
{
if( !wxLaunchDefaultBrowser( filename ) )
{
}
wxLaunchDefaultBrowser( filename );
}
void Launch(const char *filename)
@ -212,16 +210,13 @@ namespace wxHelpers
// ------------------------------------------------------------------------
// Launches a file explorer window on the specified path. If the given path is not
// a qualified URI (with a prefix:// ), file:// is automatically prepended.
// a qualified URI (with a prefix:// ), file:// is automatically prepended. This
// bypasses wxWidgets internal filename checking, which can end up launching things
// through browser more often than desired.
//
void Explore( const wxString& path )
{
if( wxLaunchDefaultBrowser(
!path.Contains( L"://") ? L"file://" + path : path )
)
{
// WARN_LOG
}
wxLaunchDefaultBrowser( !path.Contains( L"://") ? L"file://" + path : path );
}
void Explore(const char *path)

2
pcsx2/ps2/CoreEmuThread.cpp
View File

@ -19,7 +19,7 @@
#include "PrecompiledHeader.h"
#include "System.h"
#include "SaveState.h"
#include "ElfHeader.h"
#include "Elfheader.h"
#include "Plugins.h"
#include "CoreEmuThread.h"

3
pcsx2/x86/microVU_Upper.inl
View File

@ -28,7 +28,8 @@
// Note: If modXYZW is true, then it adjusts XYZW for Single Scalar operations
microVUt(void) mVUupdateFlags(mV, int reg, int regT1 = -1, int regT2 = -1, bool modXYZW = 1) {
int sReg, mReg = gprT1, xyzw = _X_Y_Z_W, regT1b = 0, regT2b = 0;
int sReg, mReg = gprT1, regT1b = 0, regT2b = 0;
//int xyzw = _X_Y_Z_W; // unused local, still needed? -- air
static const u16 flipMask[16] = {0, 8, 4, 12, 2, 10, 6, 14, 1, 9, 5, 13, 3, 11, 7, 15};
//SysPrintf("Status = %d; Mac = %d\n", sFLAG.doFlag, mFLAG.doFlag);