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

Merge pull request #741 from turtleli/wx3-regression-fixes 

wxWidgets 3.0 fixes
This commit is contained in:
avih 2015-08-05 16:04:12 -07:00
parent d38d046f7a cecdc64f51
commit 68a89bbac8
6 changed files with 18 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/wxwidgets3.0/build/msw/wx30_core_vs2013.vcxproj vendored
View File

@ -979,7 +979,7 @@
<ClInclude Include="..\..\include\wx\msw\progdlg.h" />
<ClInclude Include="..\..\include\wx\msw\radiobox.h" />
<ClInclude Include="..\..\include\wx\msw\radiobut.h" />
<ClInclude Include="..\..\include\wx\msw\rcdefs.h" />
<ClInclude Include="..\..\$(PlatformName)\wx\msw\rcdefs.h" />
<ClInclude Include="..\..\include\wx\msw\region.h" />
<ClInclude Include="..\..\include\wx\msw\richmsgdlg.h" />
<ClInclude Include="..\..\include\wx\msw\scrolbar.h" />

2
3rdparty/wxwidgets3.0/build/msw/wx30_core_vs2013.vcxproj.filters vendored
View File

@ -1171,7 +1171,7 @@
<ClInclude Include="..\..\include\wx\msw\radiobut.h">
<Filter>MSW Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\msw\rcdefs.h">
<ClInclude Include="..\..\$(PlatformName)\wx\msw\rcdefs.h">
<Filter>MSW Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\msw\region.h">

10
pcsx2/gui/Dialogs/BaseConfigurationDialog.cpp
View File

@ -301,7 +301,17 @@ void Dialogs::BaseConfigurationDialog::OnScreenshot_Click( wxCommandEvent& evt )
if( !filename.IsEmpty() )
{
ScopedBusyCursor busy( Cursor_ReallyBusy );
#ifdef __WXMSW__
// FIXME: Ideally the alpha channel information should be dealt with
// at the window level. This will do until I have a comprehensive fix
// ready.
wxImage image = memBmp.ConvertToImage();
if (image.HasAlpha())
image.ClearAlpha();
image.SaveFile( filename, wxBITMAP_TYPE_PNG );
#else
memBmp.SaveFile( filename, wxBITMAP_TYPE_PNG );
#endif
}
}

1
pcsx2/gui/FrameForGS.cpp
View File

@ -92,6 +92,7 @@ GSPanel::GSPanel( wxWindow* parent )
InitDefaultAccelerators();
SetBackgroundColour(wxColour((unsigned long)0));
if( g_Conf->GSWindow.AlwaysHideMouse )
{
SetCursor( wxCursor(wxCURSOR_BLANK) );

1
pcsx2/gui/Panels/ConfigurationPanels.h
View File

@ -353,7 +353,6 @@ namespace Panels
void OnEnable_Toggled( wxCommandEvent& evt );
void Defaults_Click( wxCommandEvent& evt );
void Slider_Click(wxScrollEvent &event);
void EECycleRate_Scroll(wxScrollEvent &event);
void VUCycleRate_Scroll(wxScrollEvent &event);
};

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

@ -197,13 +197,13 @@ Panels::SpeedHacksPanel::SpeedHacksPanel( wxWindow* parent )
*m_vuSliderPanel += m_slider_vustealer | sliderFlags;
*m_vuSliderPanel += m_msg_vustealer | sliderFlags;
*vuHacksPanel += m_check_vuFlagHack;
*vuHacksPanel += m_check_vuThread;
*vuHacksPanel += m_check_vuFlagHack | StdExpand();
*vuHacksPanel += m_check_vuThread | StdExpand();
//*vuHacksPanel += 57; // Aligns left and right boxes in default language and font size
*miscHacksPanel += m_check_intc;
*miscHacksPanel += m_check_waitloop;
*miscHacksPanel += m_check_fastCDVD;
*miscHacksPanel += m_check_intc | StdExpand();
*miscHacksPanel += m_check_waitloop | StdExpand();
*miscHacksPanel += m_check_fastCDVD | StdExpand();
*left += m_eeSliderPanel | StdExpand();
*left += miscHacksPanel | StdExpand();
@ -226,13 +226,6 @@ Panels::SpeedHacksPanel::SpeedHacksPanel( wxWindow* parent )
// ------------------------------------------------------------------------
Connect( wxEVT_SCROLL_PAGEUP, wxScrollEventHandler( SpeedHacksPanel::Slider_Click ) );
Connect( wxEVT_SCROLL_PAGEDOWN, wxScrollEventHandler( SpeedHacksPanel::Slider_Click ) );
Connect( wxEVT_SCROLL_LINEUP, wxScrollEventHandler( SpeedHacksPanel::Slider_Click ) );
Connect( wxEVT_SCROLL_LINEDOWN, wxScrollEventHandler( SpeedHacksPanel::Slider_Click ) );
Connect( wxEVT_SCROLL_TOP, wxScrollEventHandler( SpeedHacksPanel::Slider_Click ) );
Connect( wxEVT_SCROLL_BOTTOM, wxScrollEventHandler( SpeedHacksPanel::Slider_Click ) );
Connect( m_slider_eecycle->GetId(), wxEVT_SCROLL_CHANGED, wxScrollEventHandler( SpeedHacksPanel::EECycleRate_Scroll ) );
Connect( m_slider_vustealer->GetId(), wxEVT_SCROLL_CHANGED, wxScrollEventHandler( SpeedHacksPanel::VUCycleRate_Scroll ) );
Connect( m_check_Enable->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( SpeedHacksPanel::OnEnable_Toggled ) );
@ -343,30 +336,6 @@ void Panels::SpeedHacksPanel::Defaults_Click( wxCommandEvent& evt )
evt.Skip();
}
void Panels::SpeedHacksPanel::Slider_Click(wxScrollEvent &event) {
wxSlider* slider = (wxSlider*) event.GetEventObject();
int value = slider->GetValue();
int eventType = event.GetEventType();
if (eventType == wxEVT_SCROLL_PAGEUP || eventType == wxEVT_SCROLL_LINEUP) {
if (value > slider->GetMin()) {
slider->SetValue(value-1);
}
}
else if (eventType == wxEVT_SCROLL_TOP) {
slider->SetValue(slider->GetMin());
}
else if (eventType == wxEVT_SCROLL_PAGEDOWN || eventType == wxEVT_SCROLL_LINEDOWN) {
if (value < slider->GetMax()) {
slider->SetValue(value+1);
}
}
else if (eventType == wxEVT_SCROLL_BOTTOM) {
slider->SetValue(slider->GetMax());
}
event.Skip();
}
void Panels::SpeedHacksPanel::EECycleRate_Scroll(wxScrollEvent &event)
{
SetEEcycleSliderMsg();