Attachment #443630 for bug #591316

Lines 553-559 protected: Link Here

(-)a/common/include/Utilities/wxGuiTools.h (-1 / +1 lines)
553	// matically adjusts the width based on the sizer type (groupsizers get truncated to	553	// matically adjusts the width based on the sizer type (groupsizers get truncated to
554	// account for borders).	554	// account for borders).
555	//	555	//
556	class wxPanelWithHelpers : public wxPanel	556	class wxPanelWithHelpers : public wxScrolled<wxPanel>
557	{	557	{
558	DECLARE_DYNAMIC_CLASS_NO_COPY(wxPanelWithHelpers)	558	DECLARE_DYNAMIC_CLASS_NO_COPY(wxPanelWithHelpers)
559		559




}

wxPanelWithHelpers::wxPanelWithHelpers( wxWindow* parent, wxOrientation orient, const wxString& staticBoxLabel )
	: wxScrolled<wxPanel>( parent )
{
	SetSizer( new wxStaticBoxSizer( orient, this, staticBoxLabel ) );
	Init();
}

wxPanelWithHelpers::wxPanelWithHelpers( wxWindow* parent, wxOrientation orient )
	: wxScrolled<wxPanel>( parent )
{
	SetSizer( new wxBoxSizer( orient ) );
	Init();
}

wxPanelWithHelpers::wxPanelWithHelpers( wxWindow* parent )
	: wxScrolled<wxPanel>( parent )
{
	Init();
}

wxPanelWithHelpers::wxPanelWithHelpers( wxWindow* parent, const wxPoint& pos, const wxSize& size )
	: wxScrolled<wxPanel>( parent, wxID_ANY, pos, size )
{
	Init();
}

Lines 127-132 Panels::GameFixesPanel::GameFixesPanel( wxWindow* parent ) Link Here

(-)a/pcsx2/gui/Panels/GameFixesPanel.cpp (+3 lines)
127	*this += m_check_Enable \| StdExpand();	127	*this += m_check_Enable \| StdExpand();
128	*this += groupSizer \| pxCenter;	128	*this += groupSizer \| pxCenter;
129		129
		130	FitInside();
		131	SetScrollRate(10, 10);
		132
130	Bind(wxEVT_CHECKBOX, &GameFixesPanel::OnEnable_Toggled, this, m_check_Enable->GetId());	133	Bind(wxEVT_CHECKBOX, &GameFixesPanel::OnEnable_Toggled, this, m_check_Enable->GetId());
131		134
132	EnableStuff();	135	EnableStuff();

Lines 253-258 Panels::SpeedHacksPanel::SpeedHacksPanel( wxWindow* parent ) Link Here

(-)a/pcsx2/gui/Panels/SpeedhacksPanel.cpp (-1 / +3 lines)
253		253
254	// ------------------------------------------------------------------------	254	// ------------------------------------------------------------------------
255		255
		256	FitInside();
		257	SetScrollRate(10, 10);
		258
256	Bind(wxEVT_SCROLL_CHANGED, &SpeedHacksPanel::EECycleRate_Scroll, this, m_slider_eecycle->GetId());	259	Bind(wxEVT_SCROLL_CHANGED, &SpeedHacksPanel::EECycleRate_Scroll, this, m_slider_eecycle->GetId());
257	Bind(wxEVT_SCROLL_CHANGED, &SpeedHacksPanel::VUCycleRate_Scroll, this, m_slider_vustealer->GetId());	260	Bind(wxEVT_SCROLL_CHANGED, &SpeedHacksPanel::VUCycleRate_Scroll, this, m_slider_vustealer->GetId());
258	Bind(wxEVT_CHECKBOX, &SpeedHacksPanel::OnEnable_Toggled, this, m_check_Enable->GetId());	261	Bind(wxEVT_CHECKBOX, &SpeedHacksPanel::OnEnable_Toggled, this, m_check_Enable->GetId());
259	-

Return to bug 591316

Lines 434-460 pxStaticText& wxPanelWithHelpers::Heading( const wxString& label ) Link Here

(-)a/common/src/Utilities/wxHelpers.cpp (-4 / +4 lines)
434	}	434	}
435		435
436	wxPanelWithHelpers::wxPanelWithHelpers( wxWindow* parent, wxOrientation orient, const wxString& staticBoxLabel )	436	wxPanelWithHelpers::wxPanelWithHelpers( wxWindow* parent, wxOrientation orient, const wxString& staticBoxLabel )
437	: wxPanel( parent )	437	: wxScrolled<wxPanel>( parent )
438	{	438	{
439	SetSizer( new wxStaticBoxSizer( orient, this, staticBoxLabel ) );	439	SetSizer( new wxStaticBoxSizer( orient, this, staticBoxLabel ) );
440	Init();	440	Init();
441	}	441	}
442		442
443	wxPanelWithHelpers::wxPanelWithHelpers( wxWindow* parent, wxOrientation orient )	443	wxPanelWithHelpers::wxPanelWithHelpers( wxWindow* parent, wxOrientation orient )
444	: wxPanel( parent )	444	: wxScrolled<wxPanel>( parent )
445	{	445	{
446	SetSizer( new wxBoxSizer( orient ) );	446	SetSizer( new wxBoxSizer( orient ) );
447	Init();	447	Init();
448	}	448	}
449		449
450	wxPanelWithHelpers::wxPanelWithHelpers( wxWindow* parent )	450	wxPanelWithHelpers::wxPanelWithHelpers( wxWindow* parent )
451	: wxPanel( parent )	451	: wxScrolled<wxPanel>( parent )
452	{	452	{
453	Init();	453	Init();
454	}	454	}
455		455
456	wxPanelWithHelpers::wxPanelWithHelpers( wxWindow* parent, const wxPoint& pos, const wxSize& size )	456	wxPanelWithHelpers::wxPanelWithHelpers( wxWindow* parent, const wxPoint& pos, const wxSize& size )
457	: wxPanel( parent, wxID_ANY, pos, size )	457	: wxScrolled<wxPanel>( parent, wxID_ANY, pos, size )
458	{	458	{
459	Init();	459	Init();
460	}	460	}