revert r1783

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1785 10f7b99b-c216-0410-bff0-8a66a9350fd8

1 files changed, 59 insertions, 65 deletions

diff --git a/src/apps/mplayerc/PPageSubStyle.h b/src/apps/mplayerc/PPageSubStyle.h
index b1e43f251..955d9b010 100644
--- a/src/apps/mplayerc/PPageSubStyle.h
+++ b/src/apps/mplayerc/PPageSubStyle.h
@@ -31,93 +31,87 @@ class CColorStatic : public CStatic
 {

 //	DECLARE_DYNAMIC(CColorStatic)

 

-    COLORREF* m_pColor;

+	COLORREF* m_pColor;

 

 public:

-    CColorStatic(CWnd* pParent = NULL) : m_pColor(NULL) {}

-    virtual ~CColorStatic() {}

+	CColorStatic(CWnd* pParent = NULL) : m_pColor(NULL) {}

+	virtual ~CColorStatic() {}

 

-    void SetColorPtr(COLORREF* pColor)

-    {

-        m_pColor = pColor;

-    }

+	void SetColorPtr(COLORREF* pColor) {m_pColor = pColor;}

 

 //	DECLARE_MESSAGE_MAP()

 

 protected:

-    virtual void DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct)

-    {

-        CRect r;

-        GetClientRect(r);

-        CDC::FromHandle(lpDrawItemStruct->hDC)->FillSolidRect(r, m_pColor ? *m_pColor : ::GetSysColor(COLOR_BTNFACE));

-    }

+	virtual void DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct)

+	{

+		CRect r;

+		GetClientRect(r);

+		CDC::FromHandle(lpDrawItemStruct->hDC)->FillSolidRect(r, m_pColor ? *m_pColor : ::GetSysColor(COLOR_BTNFACE));

+	}

 };

 

 // CPPageSubStyle dialog

 

 class CPPageSubStyle : public CPPageBase

 {

-    DECLARE_DYNAMIC(CPPageSubStyle)

+	DECLARE_DYNAMIC(CPPageSubStyle)

 

 private:

-    CString m_title;

-    STSStyle m_stss;

-    bool m_fUseDefaultStyle;

+	CString m_title;

+	STSStyle m_stss;

+	bool m_fUseDefaultStyle;

 

-    void AskColor(int i);

+	void AskColor(int i);

 

 public:

-    CPPageSubStyle();

-    virtual ~CPPageSubStyle();

+	CPPageSubStyle();

+	virtual ~CPPageSubStyle();

 

-    void InitStyle(CString title, STSStyle& stss);

-    void GetStyle(STSStyle& stss)

-    {

-        stss = m_stss;

-    }

+	void InitStyle(CString title, STSStyle& stss);

+	void GetStyle(STSStyle& stss) {stss = m_stss;}

 

 // Dialog Data

-    enum { IDD = IDD_PPAGESUBSTYLE };

-    CButton m_font;

-    int m_iCharset;

-    CComboBox m_charset;

-    int m_spacing;

-    CSpinButtonCtrl m_spacingspin;

-    int m_angle;

-    CSpinButtonCtrl m_anglespin;

-    int m_scalex;

-    CSpinButtonCtrl m_scalexspin;

-    int m_scaley;

-    CSpinButtonCtrl m_scaleyspin;

-    int m_borderstyle;

-    int m_borderwidth;

-    CSpinButtonCtrl m_borderwidthspin;

-    int m_shadowdepth;

-    CSpinButtonCtrl m_shadowdepthspin;

-    int m_screenalignment;

-    CRect m_margin;

-    CSpinButtonCtrl m_marginleftspin;

-    CSpinButtonCtrl m_marginrightspin;

-    CSpinButtonCtrl m_margintopspin;

-    CSpinButtonCtrl m_marginbottomspin;

-    CColorStatic m_color[4];

-    int m_alpha[4];

-    CSliderCtrl m_alphasliders[4];

-    BOOL m_linkalphasliders;

-    BOOL m_relativeTo;

+	enum { IDD = IDD_PPAGESUBSTYLE };

+	CButton m_font;

+	int m_iCharset;

+	CComboBox m_charset;

+	int m_spacing;

+	CSpinButtonCtrl m_spacingspin;

+	int m_angle;

+	CSpinButtonCtrl m_anglespin;

+	int m_scalex;

+	CSpinButtonCtrl m_scalexspin;

+	int m_scaley;

+	CSpinButtonCtrl m_scaleyspin;

+	int m_borderstyle;

+	int m_borderwidth;

+	CSpinButtonCtrl m_borderwidthspin;

+	int m_shadowdepth;

+	CSpinButtonCtrl m_shadowdepthspin;

+	int m_screenalignment;

+	CRect m_margin;

+	CSpinButtonCtrl m_marginleftspin;

+	CSpinButtonCtrl m_marginrightspin;

+	CSpinButtonCtrl m_margintopspin;

+	CSpinButtonCtrl m_marginbottomspin;

+	CColorStatic m_color[4];

+	int m_alpha[4];

+	CSliderCtrl m_alphasliders[4];

+	BOOL m_linkalphasliders;

+	BOOL m_relativeTo;

 

 protected:

-    virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support

-    virtual BOOL OnInitDialog();

-    virtual BOOL OnApply();

-

-    DECLARE_MESSAGE_MAP()

-    afx_msg void OnBnClickedButton1();

-    afx_msg void OnStnClickedColorpri();

-    afx_msg void OnStnClickedColorsec();

-    afx_msg void OnStnClickedColoroutl();

-    afx_msg void OnStnClickedColorshad();

-    afx_msg void OnBnClickedCheck1();

-    afx_msg void OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar);

+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support

+	virtual BOOL OnInitDialog();

+	virtual BOOL OnApply();

+

+	DECLARE_MESSAGE_MAP()

+	afx_msg void OnBnClickedButton1();

+	afx_msg void OnStnClickedColorpri();

+	afx_msg void OnStnClickedColorsec();

+	afx_msg void OnStnClickedColoroutl();

+	afx_msg void OnStnClickedColorshad();

+	afx_msg void OnBnClickedCheck1();

+	afx_msg void OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar);

 public:

 };