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

Linux fix. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3071 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2010-05-25 03:56:19 +00:00
parent 56170870eb
commit 65facf6958
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pcsx2/CMakeLists.txt
View File

@ -366,6 +366,7 @@ set(pcsx2GuiHeaders
gui/IniInterface.h gui/IniInterface.h
gui/IsoDropTarget.h gui/IsoDropTarget.h
gui/MainFrame.h gui/MainFrame.h
gui/MemoryCardFile.h
gui/MSWstuff.h gui/MSWstuff.h
gui/Panels/ConfigurationPanels.h gui/Panels/ConfigurationPanels.h
gui/Panels/LogOptionsPanels.h gui/Panels/LogOptionsPanels.h

22
pcsx2/Linux/pcsx2.cbp
View File

@ -6,6 +6,7 @@
<Option platforms="Windows;Unix;" /> <Option platforms="Windows;Unix;" />
<Option pch_mode="2" /> <Option pch_mode="2" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option virtualFolders="Memory Card/;" />
<Build> <Build>
<Target title="Debug"> <Target title="Debug">
<Option platforms="Windows;Unix;" /> <Option platforms="Windows;Unix;" />
@ -381,7 +382,9 @@
<Unit filename="../gui/Dialogs/ImportSettingsDialog.cpp" /> <Unit filename="../gui/Dialogs/ImportSettingsDialog.cpp" />
<Unit filename="../gui/Dialogs/LogOptionsDialog.cpp" /> <Unit filename="../gui/Dialogs/LogOptionsDialog.cpp" />
<Unit filename="../gui/Dialogs/LogOptionsDialog.h" /> <Unit filename="../gui/Dialogs/LogOptionsDialog.h" />
<Unit filename="../gui/Dialogs/McdConfigDialog.cpp" /> <Unit filename="../gui/Dialogs/McdConfigDialog.cpp">
<Option virtualFolder="Memory Card/" />
</Unit>
<Unit filename="../gui/Dialogs/ModalPopups.h" /> <Unit filename="../gui/Dialogs/ModalPopups.h" />
<Unit filename="../gui/Dialogs/PickUserModeDialog.cpp" /> <Unit filename="../gui/Dialogs/PickUserModeDialog.cpp" />
<Unit filename="../gui/Dialogs/StuckThreadDialog.cpp" /> <Unit filename="../gui/Dialogs/StuckThreadDialog.cpp" />
@ -399,7 +402,10 @@
<Unit filename="../gui/MainFrame.cpp" /> <Unit filename="../gui/MainFrame.cpp" />
<Unit filename="../gui/MainFrame.h" /> <Unit filename="../gui/MainFrame.h" />
<Unit filename="../gui/MainMenuClicks.cpp" /> <Unit filename="../gui/MainMenuClicks.cpp" />
<Unit filename="../gui/MemoryCardFile.cpp" /> <Unit filename="../gui/MemoryCardFile.cpp">
<Option virtualFolder="Memory Card/" />
</Unit>
<Unit filename="../gui/MemoryCardFile.h" />
<Unit filename="../gui/MessageBoxes.cpp" /> <Unit filename="../gui/MessageBoxes.cpp" />
<Unit filename="../gui/Panels/AudioPanel.cpp" /> <Unit filename="../gui/Panels/AudioPanel.cpp" />
<Unit filename="../gui/Panels/BaseApplicableConfigPanel.cpp" /> <Unit filename="../gui/Panels/BaseApplicableConfigPanel.cpp" />
@ -412,10 +418,16 @@
<Unit filename="../gui/Panels/GameFixesPanel.cpp" /> <Unit filename="../gui/Panels/GameFixesPanel.cpp" />
<Unit filename="../gui/Panels/LogOptionsPanels.cpp" /> <Unit filename="../gui/Panels/LogOptionsPanels.cpp" />
<Unit filename="../gui/Panels/LogOptionsPanels.h" /> <Unit filename="../gui/Panels/LogOptionsPanels.h" />
<Unit filename="../gui/Panels/MemoryCardListPanel.cpp" /> <Unit filename="../gui/Panels/MemoryCardListPanel.cpp">
<Unit filename="../gui/Panels/MemoryCardListView.cpp" /> <Option virtualFolder="Memory Card/" />
</Unit>
<Unit filename="../gui/Panels/MemoryCardListView.cpp">
<Option virtualFolder="Memory Card/" />
</Unit>
<Unit filename="../gui/Panels/MemoryCardPanels.h" /> <Unit filename="../gui/Panels/MemoryCardPanels.h" />
<Unit filename="../gui/Panels/MemoryCardsPanel.cpp" /> <Unit filename="../gui/Panels/MemoryCardsPanel.cpp">
<Option virtualFolder="Memory Card/" />
</Unit>
<Unit filename="../gui/Panels/MiscPanelStuff.cpp" /> <Unit filename="../gui/Panels/MiscPanelStuff.cpp" />
<Unit filename="../gui/Panels/PathsPanel.cpp" /> <Unit filename="../gui/Panels/PathsPanel.cpp" />
<Unit filename="../gui/Panels/PluginSelectorPanel.cpp" /> <Unit filename="../gui/Panels/PluginSelectorPanel.cpp" />

4
pcsx2/gui/Dialogs/CreateMemoryCardDialog.cpp
View File

@ -61,7 +61,7 @@ Dialogs::CreateMemoryCardDialog::CreateMemoryCardDialog( wxWindow* parent, uint
if( m_radio_CardSize ) m_radio_CardSize->Realize(); if( m_radio_CardSize ) m_radio_CardSize->Realize();
wxBoxSizer& s_buttons( *new wxBoxSizer(wxHORIZONTAL) ); wxBoxSizer& s_buttons( *new wxBoxSizer(wxHORIZONTAL) );
s_buttons += new wxButton( this, wxID_OK ) | pxProportion(2); s_buttons += new wxButton( this, wxID_OK, _("Create") ) | pxProportion(2);
s_buttons += pxStretchSpacer(3); s_buttons += pxStretchSpacer(3);
s_buttons += new wxButton( this, wxID_CANCEL ) | pxProportion(2); s_buttons += new wxButton( this, wxID_CANCEL ) | pxProportion(2);
@ -88,7 +88,7 @@ Dialogs::CreateMemoryCardDialog::CreateMemoryCardDialog( wxWindow* parent, uint
*this += s_padding | StdExpand(); *this += s_padding | StdExpand();
FindItem( wxID_OK )->SetLabel(_("Create")); //FindItem( wxID_OK )->SetLabel(_("Create"));
Connect( wxID_OK, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CreateMemoryCardDialog::OnOk_Click ) ); Connect( wxID_OK, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CreateMemoryCardDialog::OnOk_Click ) );
//Connect( wxID_APPLY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CreateMemoryCardDialog::OnApply_Click ) ); //Connect( wxID_APPLY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CreateMemoryCardDialog::OnApply_Click ) );
} }