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

Linux compilation fixes. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4425 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2011-03-12 23:19:49 +00:00
parent 2cfe05d290
commit 2d5ade6016
1 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pcsx2/gui/Panels/MemoryCardListPanel.cpp
View File

@ -610,11 +610,10 @@ void Panels::MemoryCardListPanel_Simple::UpdateUI()
wxString deleteTip = _("Permanently delete this memory card file from disk (all contents are lost)"); wxString deleteTip = _("Permanently delete this memory card file from disk (all contents are lost)");
deleteTip += wxString(L"\n") + _("Note: Port needs to be disabled first, and the change then needs to be applied." ); deleteTip += wxString(L"\n") + _("Note: Port needs to be disabled first, and the change then needs to be applied." );
pxSetToolTip( m_button_Create, if (card.IsPresent)
card.IsPresent pxSetToolTip( m_button_Create, deleteTip);
? deleteTip else
: _("Create a new memory card file and assign it to the selected PS2-Port." ) pxSetToolTip( m_button_Create, _("Create a new memory card file and assign it to the selected PS2-Port." ));
);
m_button_Mount->Enable( card.IsPresent ); m_button_Mount->Enable( card.IsPresent );
m_button_Mount->SetLabel( card.IsEnabled ? _("Disable Port") : _("Enable Port") ); m_button_Mount->SetLabel( card.IsEnabled ? _("Disable Port") : _("Enable Port") );
@ -753,8 +752,8 @@ void Panels::MemoryCardListPanel_Simple::OnCreateCard(wxCommandEvent& evt)
card.IsEnabled=false; card.IsEnabled=false;
} }
} }
wxCommandEvent change(pxEvt_SomethingChanged);
this->AddPendingEvent(wxCommandEvent(pxEvt_SomethingChanged));//enable the apply button (the auto-trigger doesn't get triggered here...) this->AddPendingEvent(change);//enable the apply button (the auto-trigger doesn't get triggered here...)
RefreshSelections(); RefreshSelections();
closed_core.AllowResume(); closed_core.AllowResume();
@ -856,7 +855,8 @@ void Panels::MemoryCardListPanel_Simple::OnRenameFile(wxCommandEvent& evt)
card.Filename = newFilename; card.Filename = newFilename;
this->DoRefresh(); this->DoRefresh();
this->AddPendingEvent(wxCommandEvent(pxEvt_SomethingChanged));//enable the apply button (the auto-trigger doesn't get triggered here...) wxCommandEvent change(pxEvt_SomethingChanged);
this->AddPendingEvent(change);//enable the apply button (the auto-trigger doesn't get triggered here...)
} }
void Panels::MemoryCardListPanel_Simple::OnListDrag(wxListEvent& evt) void Panels::MemoryCardListPanel_Simple::OnListDrag(wxListEvent& evt)