Style patch part1. based on newly released astyle 1.24.

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

1 files changed, 327 insertions, 321 deletions

diff --git a/src/apps/mplayerc/LineNumberEdit.cpp b/src/apps/mplayerc/LineNumberEdit.cpp
index 9566e2cdd..fba4884cb 100644
--- a/src/apps/mplayerc/LineNumberEdit.cpp
+++ b/src/apps/mplayerc/LineNumberEdit.cpp
@@ -2,19 +2,19 @@
 	CLineNumberEdit

 	Author :		Johan Rosengren, Abstrakt Mekanik AB

 	Date :			2004-03-09

-	Purpose :		CLineNumberEdit is a CEdit-derived class that displays 

+	Purpose :		CLineNumberEdit is a CEdit-derived class that displays

 					line numbers to the left of the text.

-	Description :	The class uses the edit rect to make space for the line 

-					numbers. The line numbers are relized through a special 

-					CStatic-derived class, CLineNumberStatic. As soon as the 

-					text is updated, the CLineNumberStatic is updated as 

+	Description :	The class uses the edit rect to make space for the line

+					numbers. The line numbers are relized through a special

+					CStatic-derived class, CLineNumberStatic. As soon as the

+					text is updated, the CLineNumberStatic is updated as

 					well.

-	Usage :			The control can be dynamically created, or created from 

-					a dialog template. The formatting string for the line 

-					numbers can be set by calling SetLineNumberFormat (the 

-					same format string as for CString::Format). By calling 

-					SetMarginForegroundColor or SetMarginBackgroundColor 

-					the fore- and background colors for the line number 

+	Usage :			The control can be dynamically created, or created from

+					a dialog template. The formatting string for the line

+					numbers can be set by calling SetLineNumberFormat (the

+					same format string as for CString::Format). By calling

+					SetMarginForegroundColor or SetMarginBackgroundColor

+					the fore- and background colors for the line number

 					display is set.

    ========================================================================

 	Update :        Keith Bowes

@@ -49,8 +49,8 @@
                       values may have unexpected results.

                     - CLineNumberEdit::m_format creates a duplicate of

                       CLineNumberStatic::m_format, is this needed?

-						  JRO: Even though the the two classes are thightly coupled, 

-						  this duplication of data makes it easier to decouple them. 

+						  JRO: Even though the the two classes are thightly coupled,

+						  this duplication of data makes it easier to decouple them.

 						  A small matter, but code reuse is Politically Correct,

 						  and as such A Desirable Feature.

                     - Added options could allow different system colours to be

@@ -58,22 +58,22 @@
                     - if m_maxval is exceeded in the edit box, new lines

                       are added without line numbers. This might not be the

                       desired behaviour.

-						JRO: I think this is rather nifty, actually. If I, as a 

-						developer, sets the max number of lines to be numbered, 

+						JRO: I think this is rather nifty, actually. If I, as a

+						developer, sets the max number of lines to be numbered,

 						I also expect this to be the case :-)))

                     - It's not spelled wrong, just differently. ;0)

    ========================================================================

 	Update :        Johan Rosengren

 	Date :          2004-04-14

-	Purpose		:	1. Allow deriving of CLineNumberEdit. 

+	Purpose		:	1. Allow deriving of CLineNumberEdit.

 	Description	:	1. Made the message handlers virtual.

-	Usage :			1. Declare message handlers as virtual in derived 

-					   classes. Note that CLineNumberEdit is not built to 

+	Usage :			1. Declare message handlers as virtual in derived

+					   classes. Note that CLineNumberEdit is not built to

 					   be derived from, however.

    ========================================================================

 	Update :		Keith Bowes

 	Date :			2004-04-22

-	Purpose :		To allow processing of WM_LINESCROLL messages. 

+	Purpose :		To allow processing of WM_LINESCROLL messages.

 	Description :	Added OnLineScroll to handle the message.

 	Usage :			Now will call UpdateTopAndBottom if the message is

 					received.

@@ -89,7 +89,7 @@
 #include "stdafx.h"

 #include "LineNumberEdit.h"

 

-// Registered message to allow selection of complete 

+// Registered message to allow selection of complete

 // lines by clicking the line number

 UINT urm_SELECTLINE = ::RegisterWindowMessage( _T("_LINE_NUMBER_EDIT_SELECTLINE_") );

 

@@ -99,37 +99,37 @@ CLineNumberEdit::CLineNumberEdit()
 /* ============================================================

 	Function :		CLineNumberEdit::CLineNumberEdit

 	Description :	constructor

-     

+

 	Return :		void

 	Parameters :	none

 

-	Usage :			

+	Usage :

 

    ============================================================*/

 {

 

-	m_hWnd = NULL;

-	m_line.m_hWnd = NULL;

-	m_zero.cx = 0;

-	m_zero.cy = 0;

-	m_format = _T( "%03i" );

-	m_LineDelta = 1;

+    m_hWnd = NULL;

+    m_line.m_hWnd = NULL;

+    m_zero.cx = 0;

+    m_zero.cy = 0;

+    m_format = _T( "%03i" );

+    m_LineDelta = 1;

 

-	// Could default m_maxval to 99,999, but may cause problems 

-	// if m_format is changed and m_maxval is not...

-	m_maxval = 998;

+    // Could default m_maxval to 99,999, but may cause problems

+    // if m_format is changed and m_maxval is not...

+    m_maxval = 998;

 

-	// Setting up so by defult the original hard-coded colour 

-	// scheme is used when enabled and the system colours are 

-	// used when disabled.

-	m_bUseEnabledSystemColours = FALSE;

-	m_bUseDisabledSystemColours = TRUE;

-	m_EnabledFgCol = RGB( 0, 0, 0 );

-	m_EnabledBgCol = RGB( 200, 200, 200 );

-	m_DisabledFgCol = GetSysColor( COLOR_GRAYTEXT );

-	m_DisabledBgCol = GetSysColor( COLOR_3DFACE );

+    // Setting up so by defult the original hard-coded colour

+    // scheme is used when enabled and the system colours are

+    // used when disabled.

+    m_bUseEnabledSystemColours = FALSE;

+    m_bUseDisabledSystemColours = TRUE;

+    m_EnabledFgCol = RGB( 0, 0, 0 );

+    m_EnabledBgCol = RGB( 200, 200, 200 );

+    m_DisabledFgCol = GetSysColor( COLOR_GRAYTEXT );

+    m_DisabledBgCol = GetSysColor( COLOR_3DFACE );

 

-	SetWindowColour();

+    SetWindowColour();

 

 }

 

@@ -137,35 +137,35 @@ CLineNumberEdit::~CLineNumberEdit()
 /* ============================================================

 	Function :		CLineNumberEdit::~CLineNumberEdit

 	Description :	destructor

- 

+

 	Return :		void

 	Parameters :	none

 

-	Usage :			

+	Usage :

 

    ============================================================*/

 {

 }

 

 BEGIN_MESSAGE_MAP(CLineNumberEdit, CEdit)

-	ON_CONTROL_REFLECT(EN_CHANGE, OnChange)

-	ON_WM_VSCROLL()

-	ON_CONTROL_REFLECT(EN_VSCROLL, OnVscroll)

-	ON_MESSAGE(WM_SETFONT, OnSetFont)

-	ON_WM_SIZE()

-	ON_MESSAGE(WM_SETTEXT, OnSetText)

-	ON_WM_SYSCOLORCHANGE()

-	ON_WM_ENABLE()

-	ON_MESSAGE(EM_LINESCROLL, OnLineScroll)

-	ON_REGISTERED_MESSAGE(urm_SELECTLINE, OnSelectLine)

+    ON_CONTROL_REFLECT(EN_CHANGE, OnChange)

+    ON_WM_VSCROLL()

+    ON_CONTROL_REFLECT(EN_VSCROLL, OnVscroll)

+    ON_MESSAGE(WM_SETFONT, OnSetFont)

+    ON_WM_SIZE()

+    ON_MESSAGE(WM_SETTEXT, OnSetText)

+    ON_WM_SYSCOLORCHANGE()

+    ON_WM_ENABLE()

+    ON_MESSAGE(EM_LINESCROLL, OnLineScroll)

+    ON_REGISTERED_MESSAGE(urm_SELECTLINE, OnSelectLine)

 END_MESSAGE_MAP()

 

-void CLineNumberEdit::PreSubclassWindow() 

+void CLineNumberEdit::PreSubclassWindow()

 /* ============================================================

 	Function :		CLineNumberEdit::PreSubclassWindow

-	Description :	This function is called before the control 

-					is subclassed for a control on a dialog 

-					template, and during creation for 

+	Description :	This function is called before the control

+					is subclassed for a control on a dialog

+					template, and during creation for

 					dynamically created controls.

 

 	Return :		void

@@ -176,24 +176,24 @@ void CLineNumberEdit::PreSubclassWindow()
    ============================================================*/

 {

 

-	// Unfortunately, we can't change to ES_MULTILINE

-	// during run-time.

-	ASSERT( GetStyle() & ES_MULTILINE );

+    // Unfortunately, we can't change to ES_MULTILINE

+    // during run-time.

+    ASSERT( GetStyle() & ES_MULTILINE );

 

-	// Creating the line number control

-	SetLineNumberFormat( m_format );

+    // Creating the line number control

+    SetLineNumberFormat( m_format );

 

 }

 

 /////////////////////////////////////////////////////////////////////////////

 // CLineNumberEdit message handlers

 

-void CLineNumberEdit::OnSysColorChange() 

+void CLineNumberEdit::OnSysColorChange()

 /* ============================================================

 	Function :		CLineNumberEdit::OnSysColorChange

 	Description :	Handles WM_SYSCOLORCHANGE. User has changed

 					the system colours, want to refresh.

- 

+

 	Return :		void

 	Parameters :	void

 

@@ -202,7 +202,7 @@ void CLineNumberEdit::OnSysColorChange()
    ============================================================*/

 {

 

-	CEdit::OnSysColorChange();

+    CEdit::OnSysColorChange();

 

     // update the CStatic with the new colours

     SetWindowColour( IsWindowEnabled() );

@@ -212,9 +212,9 @@ void CLineNumberEdit::OnSysColorChange()
 LRESULT CLineNumberEdit::OnSetText( WPARAM wParam, LPARAM lParam )

 /* ============================================================

 	Function :		CLineNumberEdit::OnSetText

-	Description :	Handles WM_SETTEXT. We must update the line 

+	Description :	Handles WM_SETTEXT. We must update the line

 					numbers in the line number control as well.

- 

+

 	Return :		LRESULT			- From Def proc

 	Parameters :	WPARAM wParam	- From Windows

 					LPARAM lParam	- From Windows

@@ -224,20 +224,20 @@ LRESULT CLineNumberEdit::OnSetText( WPARAM wParam, LPARAM lParam )
    ============================================================*/

 {

 

-	// Default processing

-	LRESULT retval = DefWindowProc( WM_SETTEXT, wParam, lParam );

-	UpdateTopAndBottom();

-	return retval;

+    // Default processing

+    LRESULT retval = DefWindowProc( WM_SETTEXT, wParam, lParam );

+    UpdateTopAndBottom();

+    return retval;

 

 }

 

-void CLineNumberEdit::OnChange() 

+void CLineNumberEdit::OnChange()

 /* ============================================================

 	Function :		CLineNumberEdit::OnChange

-	Description :	Mapped to EN_CHANGE. We must handle 

-					EN_CHANGE to let the line-number control 

+	Description :	Mapped to EN_CHANGE. We must handle

+					EN_CHANGE to let the line-number control

 					reflect changes to the edit box content.

- 

+

 	Return :		void

 	Parameters :	none

 

@@ -246,16 +246,16 @@ void CLineNumberEdit::OnChange()
    ============================================================*/

 {

 

-	UpdateTopAndBottom();

+    UpdateTopAndBottom();

 

 }

 

-void CLineNumberEdit::OnVscroll() 

+void CLineNumberEdit::OnVscroll()

 /* ============================================================

 	Function :		CLineNumberEdit::OnVscroll

-	Description :	Mapped to EN_VSCROLL. We update the line 

+	Description :	Mapped to EN_VSCROLL. We update the line

 					numbers in the line number control

- 

+

 	Return :		void

 	Parameters :	none

 

@@ -264,17 +264,17 @@ void CLineNumberEdit::OnVscroll()
    ============================================================*/

 {

 

-	UpdateTopAndBottom();

+    UpdateTopAndBottom();

 

 }

 

-void CLineNumberEdit::OnVScroll( UINT nSBCode, UINT nPos, CScrollBar* pScrollBar ) 

+void CLineNumberEdit::OnVScroll( UINT nSBCode, UINT nPos, CScrollBar* pScrollBar )

 /* ============================================================

 	Function :		CLineNumberEdit::OnVScroll

-	Description :	Handles WM_VSCROLL. We handle WM_VSCROLL 

-					in addition to the notification EN_VSCROLL, 

+	Description :	Handles WM_VSCROLL. We handle WM_VSCROLL

+					in addition to the notification EN_VSCROLL,

 					to handle scrollbar dragging as well

- 

+

 	Return :		void

 	Parameters :	UINT nSBCode			- From Windows

 					UINT nPos				- From Windows

@@ -285,36 +285,36 @@ void CLineNumberEdit::OnVScroll( UINT nSBCode, UINT nPos, CScrollBar* pScrollBar
    ============================================================*/

 {

 

-	CEdit::OnVScroll( nSBCode, nPos, pScrollBar );

-	UpdateTopAndBottom();

+    CEdit::OnVScroll( nSBCode, nPos, pScrollBar );

+    UpdateTopAndBottom();

 

 }

 

-LRESULT CLineNumberEdit::OnLineScroll( WPARAM wParam, LPARAM lParam ) 

+LRESULT CLineNumberEdit::OnLineScroll( WPARAM wParam, LPARAM lParam )

 /* ============================================================

 	Function	:	CLineNumberEdit::OnLineScroll

-	Description	:	Mapped to EM_LINESCROLL. We update the line 

+	Description	:	Mapped to EM_LINESCROLL. We update the line

 					numbers in the line number control.

-     

+

 	Return		:	void

 	Parameters	:	none

 	Usage		:	Called from Windows

    ============================================================*/

 {

 

-	// Default processing

-	LRESULT retval = DefWindowProc( EM_LINESCROLL, wParam, lParam );

-	UpdateTopAndBottom();

-	return retval;

+    // Default processing

+    LRESULT retval = DefWindowProc( EM_LINESCROLL, wParam, lParam );

+    UpdateTopAndBottom();

+    return retval;

 

 }

 

 LRESULT CLineNumberEdit::OnSetFont( WPARAM wParam, LPARAM lParam )

 /* ============================================================

 	Function :		CLineNumberEdit::OnSetFont

-	Description :	Mapped to WM_SETFONT. We must recalculate 

+	Description :	Mapped to WM_SETFONT. We must recalculate

 					the line number control size as well.

- 

+

 	Return :		LRESULT			- Always 0

 	Parameters :	WPARAM wParam	- From Windows

 					LPARAM lParam	- From Windows

@@ -324,20 +324,20 @@ LRESULT CLineNumberEdit::OnSetFont( WPARAM wParam, LPARAM lParam )
    ============================================================*/

 {

 

-	DefWindowProc( WM_SETFONT, wParam, lParam );

-	// We resize the line-number

-	// field

-	Prepare();

-	return 0;

+    DefWindowProc( WM_SETFONT, wParam, lParam );

+    // We resize the line-number

+    // field

+    Prepare();

+    return 0;

 

 }

 

-void CLineNumberEdit::OnSize( UINT nType, int cx, int cy ) 

+void CLineNumberEdit::OnSize( UINT nType, int cx, int cy )

 /* ============================================================

 	Function :		CLineNumberEdit::OnSize

-	Description :	Handles WM_SIZE. Recalculates the line 

+	Description :	Handles WM_SIZE. Recalculates the line

 					number control size as well.

- 

+

 	Return :		void

 	Parameters :	UINT nType	- From Windows

 					int cx		- From Windows

@@ -348,21 +348,21 @@ void CLineNumberEdit::OnSize( UINT nType, int cx, int cy )
    ============================================================*/

 {

 

-	CEdit::OnSize( nType, cx, cy );

+    CEdit::OnSize( nType, cx, cy );

+

+    // If we have the line-number

+    // control, it must be resized

+    // as well.

+    if( m_line.m_hWnd )

+        Prepare();

 

-	// If we have the line-number

-	// control, it must be resized 

-	// as well.

-	if( m_line.m_hWnd )

-		Prepare();

- 

 }

 

-void CLineNumberEdit::OnEnable( BOOL bEnable ) 

+void CLineNumberEdit::OnEnable( BOOL bEnable )

 /* ============================================================

 	Function :		CLineNumberEdit::OnEnable

 	Description :	Handles WM_ENABLE. Calls to set colours.

- 

+

 	Return :		void

 	Parameters :	BOOL bEnable - From Windows

 

@@ -371,7 +371,7 @@ void CLineNumberEdit::OnEnable( BOOL bEnable )
    ============================================================*/

 {

 

-	CEdit::OnEnable( bEnable );

+    CEdit::OnEnable( bEnable );

     SetWindowColour( bEnable );

 

 }

@@ -381,24 +381,24 @@ LRESULT CLineNumberEdit::OnSelectLine(WPARAM wParam, LPARAM /*lParam*/ )
 	Function :		CLineNumberEdit::OnSelectLine

 	Description :	Handler for the urm_SELECTLINE registered

 					message. Will select the line in wParam.

-					

+

 	Return :		LRESULT			-	Not used

 	Parameters :	WPARAM wParam	-	The line to select

 					LPARAM lParam	-	Not used

-					

-	Usage :			Called from MFC. Use 

-					SendMessage( urm_SELECTLINE, line ) from 

+

+	Usage :			Called from MFC. Use

+					SendMessage( urm_SELECTLINE, line ) from

 					code.

 

    ============================================================*/

 {

 

-	// Calc start and end position of the line

-	int lineno = wParam + GetScrollPos( SB_VERT );

-	int start = LineIndex( lineno );

-	int end = LineIndex( lineno + 1 );

-	SetSel( start, end - 1 );

-	return 0;

+    // Calc start and end position of the line

+    int lineno = wParam + GetScrollPos( SB_VERT );

+    int start = LineIndex( lineno );

+    int end = LineIndex( lineno + 1 );

+    SetSel( start, end - 1 );

+    return 0;

 

 }

 

@@ -406,9 +406,9 @@ void CLineNumberEdit::SetWindowColour( BOOL bEnable /*= TRUE*/ )
 /* ============================================================

 	Function :		CLineNumberEdit::SetWindowColour

 	Description :	Handles changing window colours.

- 

+

 	Return :		void

-	Parameters :	BOOL bEnable -	flag if set enabled/disabled 

+	Parameters :	BOOL bEnable -	flag if set enabled/disabled

 									colours

 

 	Usage :			Called to change colours in the edit box.

@@ -418,16 +418,16 @@ void CLineNumberEdit::SetWindowColour( BOOL bEnable /*= TRUE*/ )
 

     if (m_bUseEnabledSystemColours)

     {

-		// re-query the system colours in case they have changed.

-		m_EnabledFgCol = GetSysColor( COLOR_WINDOWTEXT );

-		m_EnabledBgCol = GetSysColor( COLOR_WINDOW );

+        // re-query the system colours in case they have changed.

+        m_EnabledFgCol = GetSysColor( COLOR_WINDOWTEXT );

+        m_EnabledBgCol = GetSysColor( COLOR_WINDOW );

     }

 

     if (m_bUseDisabledSystemColours)

     {

-		// re-query the system colours in case they have changed.

-		m_DisabledFgCol = GetSysColor( COLOR_GRAYTEXT );

-		m_DisabledBgCol = GetSysColor( COLOR_3DFACE );

+        // re-query the system colours in case they have changed.

+        m_DisabledFgCol = GetSysColor( COLOR_GRAYTEXT );

+        m_DisabledBgCol = GetSysColor( COLOR_3DFACE );

     }

 

     // change the colour based on bEnable

@@ -435,7 +435,9 @@ void CLineNumberEdit::SetWindowColour( BOOL bEnable /*= TRUE*/ )
     {

         m_line.SetFgColor( m_EnabledFgCol, TRUE );

         m_line.SetBgColor( m_EnabledBgCol, TRUE );

-    } else {

+    }

+    else

+    {

         m_line.SetFgColor( m_DisabledFgCol, TRUE );

         m_line.SetBgColor( m_DisabledBgCol, TRUE );

     }

@@ -446,11 +448,11 @@ void CLineNumberEdit::UseSystemColours( BOOL bUseEnabled /*= TRUE*/, BOOL bUseDi
 /* ============================================================

 	Function :		CLineNumberEdit::UseSystemColours

 	Description :	Sets the Use*SystemColours flags.

- 

+

 	Return :		void

-	Parameters :	BOOL bEnabled	-	flag if to use enabled 

+	Parameters :	BOOL bEnabled	-	flag if to use enabled

 										system colours

-					BOOL bDisabled	-	flag if to use disabled 

+					BOOL bDisabled	-	flag if to use disabled

 										system colours

 

 	Usage :			Called to change colours in the edit box

@@ -474,122 +476,122 @@ void CLineNumberEdit::UseSystemColours( BOOL bUseEnabled /*= TRUE*/, BOOL bUseDi
 void CLineNumberEdit::Prepare()

 /* ============================================================

 	Function :		CLineNumberEdit::Prepare

-	Description :	Setting the edit rect for the control and 

-					either create or move the line number 

-					control. Also sets the top- and bottom 

+	Description :	Setting the edit rect for the control and

+					either create or move the line number

+					control. Also sets the top- and bottom

 					line numbers.

- 

+

 	Return :		void

 	Parameters :	none

 

-	Usage :			Must be called to (re)establish the edit 

-					rect, must also be called as soon as the 

+	Usage :			Must be called to (re)establish the edit

+					rect, must also be called as soon as the

 					control changes size.

 

    ============================================================*/

 {

 

-	// Calc sizes

-	int width = CalcLineNumberWidth();

-	CRect rect;

-	GetClientRect( &rect );

-	CRect rectEdit( rect );

-	rect.right = width;

-	rectEdit.left = rect.right + 3;

+    // Calc sizes

+    int width = CalcLineNumberWidth();

+    CRect rect;

+    GetClientRect( &rect );

+    CRect rectEdit( rect );

+    rect.right = width;

+    rectEdit.left = rect.right + 3;

 

-	// Setting the edit rect and 

-	// creating or moving child control

-	SetRect( &rectEdit );

-	if( m_line.m_hWnd )

-		m_line.MoveWindow( 0, 0, width, rect.Height() );

-	else

-		m_line.Create(NULL,WS_CHILD | WS_VISIBLE | SS_NOTIFY, rect, this, 1 );

+    // Setting the edit rect and

+    // creating or moving child control

+    SetRect( &rectEdit );

+    if( m_line.m_hWnd )

+        m_line.MoveWindow( 0, 0, width, rect.Height() );

+    else

+        m_line.Create(NULL,WS_CHILD | WS_VISIBLE | SS_NOTIFY, rect, this, 1 );

 

-	GetRect( &rectEdit );

+    GetRect( &rectEdit );

 

-	// Update line number control data

-	m_line.SetTopMargin( rectEdit.top );

-	UpdateTopAndBottom();

+    // Update line number control data

+    m_line.SetTopMargin( rectEdit.top );

+    UpdateTopAndBottom();

 

 }

 

 int CLineNumberEdit::CalcLineNumberWidth()

 /* ============================================================

 	Function :		CLineNumberEdit::CalcLineNumberWidth

-	Description :	Calculates the desired width of the line 

-					number control, using the current format 

-					string and the max number of chars allowed 

-					(pessimistic - assumes one character per 

+	Description :	Calculates the desired width of the line

+					number control, using the current format

+					string and the max number of chars allowed

+					(pessimistic - assumes one character per

 					line).

- 

+

 	Return :		int - The width in pixels

 	Parameters :	none

 

-	Usage :			Called as soon as the format string is 

+	Usage :			Called as soon as the format string is

 					changed.

 

    ============================================================*/

 {

 

-	CClientDC dc( this );

+    CClientDC dc( this );

 

-	// If a new font is set during runtime,

-	// we must explicitly select the font into

-	// the CClientDC to measure it.

-	CFont* font = GetFont();

-	CFont* oldFont = dc.SelectObject( font );

+    // If a new font is set during runtime,

+    // we must explicitly select the font into

+    // the CClientDC to measure it.

+    CFont* font = GetFont();

+    CFont* oldFont = dc.SelectObject( font );

 

-	m_zero=dc.GetTextExtent( _T( "0" ) );

-	CString format;

+    m_zero=dc.GetTextExtent( _T( "0" ) );

+    CString format;

 

     // GetLimitText returns the number of bytes the edit box may contain,

     // not the max number of lines...

-	//... which is the max number of lines, given one character per d:o :-)

-	int maxval = GetLimitText();

+    //... which is the max number of lines, given one character per d:o :-)

+    int maxval = GetLimitText();

     if (m_maxval > 0)

         maxval = m_maxval + m_LineDelta;

 

-	format.Format( m_format, maxval );

-	CSize fmt = dc.GetTextExtent( format );

-	dc.SelectObject( oldFont );

+    format.Format( m_format, maxval );

+    CSize fmt = dc.GetTextExtent( format );

+    dc.SelectObject( oldFont );

 

-	// Calculate the size of the line-

-	// number field. We add a 5 pixel margin

-	// to the max size of the format string

-	return fmt.cx + 5;

+    // Calculate the size of the line-

+    // number field. We add a 5 pixel margin

+    // to the max size of the format string

+    return fmt.cx + 5;

 

 }

 

-void CLineNumberEdit::UpdateTopAndBottom() 

+void CLineNumberEdit::UpdateTopAndBottom()

 /* ============================================================

 	Function :		CLineNumberEdit::UpdateTopAndBottom

-	Description :	Updates the top- and bottom line number 

+	Description :	Updates the top- and bottom line number

 					for the line number control.

- 

+

 	Return :		void

 	Parameters :	none

-	Usage :			Should be called as soon as the contents of 

+	Usage :			Should be called as soon as the contents of

 					the control is changed.

 

    ============================================================*/

 {

 

-	CRect rect;

-	GetClientRect( &rect );

-	int maxline = GetLineCount() + m_LineDelta;

+    CRect rect;

+    GetClientRect( &rect );

+    int maxline = GetLineCount() + m_LineDelta;

 

-	// Height for individual lines

-	int lineheight = m_zero.cy;

+    // Height for individual lines

+    int lineheight = m_zero.cy;

 

-	// Calculate the number of lines to draw

-	int topline = GetFirstVisibleLine() + m_LineDelta;

-	if( ( topline + ( rect.Height() / lineheight ) ) < maxline )

-		maxline = topline + ( rect.Height() / lineheight );

+    // Calculate the number of lines to draw

+    int topline = GetFirstVisibleLine() + m_LineDelta;

+    if( ( topline + ( rect.Height() / lineheight ) ) < maxline )

+        maxline = topline + ( rect.Height() / lineheight );

 

     if ( m_maxval > 0 && maxline > m_maxval + m_LineDelta )

         maxline = m_maxval + m_LineDelta;

 

-	m_line.SetTopAndBottom( topline, maxline );

+    m_line.SetTopAndBottom( topline, maxline );

 

 }

 

@@ -599,13 +601,13 @@ void CLineNumberEdit::UpdateTopAndBottom()
 void CLineNumberEdit::SetMarginForegroundColor( COLORREF col, BOOL redraw, BOOL bEnabled /*= TRUE*/ )

 /* ============================================================

 	Function :		CLineNumberEdit::SetMarginForegroundColor

-	Description :	Sets the text color for the number 

+	Description :	Sets the text color for the number

 					margin.

- 

+

 	Return :		void

-	Parameters :	COLORREF col	-	The new text color 

-					BOOL redraw		-	TRUE if the control 

-										should be redrawn 

+	Parameters :	COLORREF col	-	The new text color

+					BOOL redraw		-	TRUE if the control

+										should be redrawn

 										(default)

 

 	Usage :			Call to set a new text color for the line

@@ -615,12 +617,14 @@ void CLineNumberEdit::SetMarginForegroundColor( COLORREF col, BOOL redraw, BOOL
    ============================================================*/

 {

 

-	m_line.SetFgColor( col, redraw );

+    m_line.SetFgColor( col, redraw );

     if (bEnabled)

     {

         m_bUseEnabledSystemColours = FALSE;

         m_EnabledFgCol = col;

-    } else {

+    }

+    else

+    {

         m_bUseDisabledSystemColours = FALSE;

         m_DisabledFgCol = col;

     }

@@ -630,28 +634,30 @@ void CLineNumberEdit::SetMarginForegroundColor( COLORREF col, BOOL redraw, BOOL
 void CLineNumberEdit::SetMarginBackgroundColor( COLORREF col, BOOL redraw, BOOL bEnabled /*= TRUE*/ )

 /* ============================================================

 	Function :		CLineNumberEdit::SetMarginBackgroundColor

-	Description :	Sets the background color for the number 

+	Description :	Sets the background color for the number

 					margin.

- 

+

 	Return :		void

-	Parameters :	COLORREF col	-	The new background color 

-					BOOL redraw		-	TRUE if the control 

-										should be redrawn 

+	Parameters :	COLORREF col	-	The new background color

+					BOOL redraw		-	TRUE if the control

+										should be redrawn

 										(default)

 

-	Usage :			Call to set a new background color for the 

-					line number margin. The control will be 

+	Usage :			Call to set a new background color for the

+					line number margin. The control will be

 					redrawn if it exists.

 

    ============================================================*/

 {

 

-	m_line.SetBgColor( col, redraw );

+    m_line.SetBgColor( col, redraw );

     if (bEnabled)

     {

         m_bUseEnabledSystemColours = FALSE;

         m_EnabledBgCol = col;

-    } else {

+    }

+    else

+    {

         m_bUseDisabledSystemColours = FALSE;

         m_DisabledBgCol = col;

     }

@@ -661,31 +667,31 @@ void CLineNumberEdit::SetMarginBackgroundColor( COLORREF col, BOOL redraw, BOOL
 void CLineNumberEdit::SetLineNumberFormat( CString format )

 /* ============================================================

 	Function :		CLineNumberEdit::SetLineNumberFormat

-	Description :	Changes the way line numbers are presented 

-					on screen. 

- 

+	Description :	Changes the way line numbers are presented

+					on screen.

+

 	Return :		void

 	Parameters :	CString format - The new format string

 

-	Usage :			Call with a format string using the same 

-					format as CString::Format. It should contain 

+	Usage :			Call with a format string using the same

+					format as CString::Format. It should contain

 					one and only one numeric type.

 

    ============================================================*/

 {

 

-	m_format = format;

-	m_line.SetLineNumberFormat( format );

-	if( m_hWnd )

-		Prepare();

+    m_format = format;

+    m_line.SetLineNumberFormat( format );

+    if( m_hWnd )

+        Prepare();

 

 }

 

 void CLineNumberEdit::SetLineNumberRange( UINT nMin, UINT nMax /*= 0*/ )

 /* ============================================================

 	Function :		CLineNumberEdit::SetLineNumberRange

-	Description :	Changes the default min and max line numbers. 

- 

+	Description :	Changes the default min and max line numbers.

+

 	Return :		void

 	Parameters :	int nMin - changes the line offset

 					int nMax - changes the max line number

@@ -707,17 +713,17 @@ CLineNumberStatic::CLineNumberStatic()
 /* ============================================================

 	Function :		CLineNumberStatic::CLineNumberStatic

 	Description :	constructor

- 

+

 	Return :		void

 	Parameters :	none

 

-	Usage :			

+	Usage :

 

    ============================================================*/

 {

 

-	m_bgcol = RGB( 255, 255, 248 );

-	m_fgcol = RGB( 0, 0, 0 );

+    m_bgcol = RGB( 255, 255, 248 );

+    m_fgcol = RGB( 0, 0, 0 );

     m_format = _T( "%05i" );

     m_topline = 0;

     m_bottomline = 0;

@@ -727,30 +733,30 @@ CLineNumberStatic::~CLineNumberStatic()
 /* ============================================================

 	Function :		CLineNumberStatic::~CLineNumberStatic

 	Description :	destructor

- 

+

 	Return :		void

 	Parameters :	none

 

-	Usage :			

+	Usage :

 

    ============================================================*/

 {

 }

 

 BEGIN_MESSAGE_MAP(CLineNumberStatic, CStatic)

-	ON_WM_PAINT()

-	ON_WM_ERASEBKGND()

-	ON_WM_LBUTTONDOWN()

+    ON_WM_PAINT()

+    ON_WM_ERASEBKGND()

+    ON_WM_LBUTTONDOWN()

 END_MESSAGE_MAP()

 

 /////////////////////////////////////////////////////////////////////////////

 // CLineNumberStatic message handlers

 

-void CLineNumberStatic::OnPaint() 

+void CLineNumberStatic::OnPaint()

 /* ============================================================

 	Function :		CLineNumberStatic::OnPaint

-	Description :	Handler for WM_PAINT. 

- 

+	Description :	Handler for WM_PAINT.

+

 	Return :		void

 	Parameters :	none

 

@@ -759,60 +765,60 @@ void CLineNumberStatic::OnPaint()
    ============================================================*/

 {

 

-	CPaintDC dcPaint( this );

+    CPaintDC dcPaint( this );

 

-	CRect rect;

-	GetClientRect( &rect );

+    CRect rect;

+    GetClientRect( &rect );

 

-	// We double buffer the drawing - 

-	// preparing the memory CDC

-	CDC dc;

-	dc.CreateCompatibleDC( &dcPaint );

-	int saved = dc.SaveDC();

+    // We double buffer the drawing -

+    // preparing the memory CDC

+    CDC dc;

+    dc.CreateCompatibleDC( &dcPaint );

+    int saved = dc.SaveDC();

 

-	// Create GDI and select objects

-	CBitmap bmp;

-	CPen pen;

-	bmp.CreateCompatibleBitmap( &dcPaint, rect.Width(), rect.Height() );

-	pen.CreatePen( PS_SOLID, 1, m_fgcol );

-	dc.SelectObject( &bmp );

-	dc.SelectObject( &pen );

+    // Create GDI and select objects

+    CBitmap bmp;

+    CPen pen;

+    bmp.CreateCompatibleBitmap( &dcPaint, rect.Width(), rect.Height() );

+    pen.CreatePen( PS_SOLID, 1, m_fgcol );

+    dc.SelectObject( &bmp );

+    dc.SelectObject( &pen );

 

-	// Painting the background

-	dc.FillSolidRect( &rect, m_bgcol );

-	dc.MoveTo( rect.right - 1, 0 );

-	dc.LineTo( rect.right - 1, rect.bottom );

+    // Painting the background

+    dc.FillSolidRect( &rect, m_bgcol );

+    dc.MoveTo( rect.right - 1, 0 );

+    dc.LineTo( rect.right - 1, rect.bottom );

 

-	// Setting other attributes

-	dc.SetTextColor( m_fgcol );

-	dc.SetBkColor( m_bgcol );

-	dc.SelectObject( GetParent()->GetFont() );

+    // Setting other attributes

+    dc.SetTextColor( m_fgcol );

+    dc.SetBkColor( m_bgcol );

+    dc.SelectObject( GetParent()->GetFont() );

 

-	// Output the line numbers

-	if( m_bottomline )

-	{

-		int lineheight = dc.GetTextExtent( _T( "0" ) ).cy;

-		for( int t = m_topline ; t < m_bottomline ; t++ )

-		{

-			CString output;

-			output.Format( m_format, t );

-			int topposition = m_topmargin + lineheight * ( t - m_topline );

-			dc.TextOut( 2, topposition, output );

-		}

-	}

+    // Output the line numbers

+    if( m_bottomline )

+    {

+        int lineheight = dc.GetTextExtent( _T( "0" ) ).cy;

+        for( int t = m_topline ; t < m_bottomline ; t++ )

+        {

+            CString output;

+            output.Format( m_format, t );

+            int topposition = m_topmargin + lineheight * ( t - m_topline );

+            dc.TextOut( 2, topposition, output );

+        }

+    }

 

-	dcPaint.BitBlt( 0, 0, rect. right, rect.bottom, &dc, 0, 0, SRCCOPY );

-	dc.RestoreDC( saved );

+    dcPaint.BitBlt( 0, 0, rect. right, rect.bottom, &dc, 0, 0, SRCCOPY );

+    dc.RestoreDC( saved );

 

 }

 

-BOOL CLineNumberStatic::OnEraseBkgnd( CDC* ) 

+BOOL CLineNumberStatic::OnEraseBkgnd( CDC* )

 /* ============================================================

 	Function :		CLineNumberStatic::OnEraseBkgnd

 	Description :	Mapped to WM_ERASEBKGND. Handled to avoid

-					flicker, as we redraw the complete control 

+					flicker, as we redraw the complete control

 					in OnPaint

- 

+

 	Return :		BOOL  -	Always TRUE

 	Parameters :	CDC*  -	From Windows

 

@@ -821,7 +827,7 @@ BOOL CLineNumberStatic::OnEraseBkgnd( CDC* )
    ============================================================*/

 {

 

-	return TRUE;

+    return TRUE;

 

 }

 

@@ -829,28 +835,28 @@ void CLineNumberStatic::OnLButtonDown( UINT nFlags, CPoint point )
 /* ============================================================

 	Function :		CLineNumberStatic::OnLButtonDown

 	Description :	Called when the control is clicked. Will

-					send the urm_SELECTLINE registered message 

+					send the urm_SELECTLINE registered message

 					to the parent to select the line clicked on.

-					

+

 	Return :		void

 	Parameters :	UINT nFlags		-	Not used

 					CPoint point	-	Position of cursor

-					

+

 	Usage :			Called from Windows.

 

    ============================================================*/

 {

 

-	// Find the line clicked on

-	CClientDC	dc( this );

-	dc.SelectObject( GetParent()->GetFont() );

-	int lineheight = dc.GetTextExtent( _T( "0" ) ).cy;

-	int lineno = ( int ) ( ( double ) point.y / ( double ) lineheight );

+    // Find the line clicked on

+    CClientDC	dc( this );

+    dc.SelectObject( GetParent()->GetFont() );

+    int lineheight = dc.GetTextExtent( _T( "0" ) ).cy;

+    int lineno = ( int ) ( ( double ) point.y / ( double ) lineheight );

 

-	// Select this line in the edit control

-	GetParent()->SendMessage( urm_SELECTLINE, lineno );

+    // Select this line in the edit control

+    GetParent()->SendMessage( urm_SELECTLINE, lineno );

 

-	CStatic::OnLButtonDown( nFlags, point );

+    CStatic::OnLButtonDown( nFlags, point );

 

 }

 

@@ -860,13 +866,13 @@ void CLineNumberStatic::OnLButtonDown( UINT nFlags, CPoint point )
 void CLineNumberStatic::SetBgColor( COLORREF col, BOOL redraw )

 /* ============================================================

 	Function :		CLineNumberStatic::SetBgColor

-	Description :	This function sets the panel background 

+	Description :	This function sets the panel background

 					color

- 

+

 	Return :		void

 	Parameters :	COLORREF col -	New background color

-					BOOL redraw  -	TRUE if the control 

-									should be redrawn 

+					BOOL redraw  -	TRUE if the control

+									should be redrawn

 									(default)

 

 	Usage :			Called from the parent.

@@ -874,55 +880,55 @@ void CLineNumberStatic::SetBgColor( COLORREF col, BOOL redraw )
    ============================================================*/

 {

 

-	m_bgcol = col;

-	if( m_hWnd && redraw )

-		RedrawWindow();

+    m_bgcol = col;

+    if( m_hWnd && redraw )

+        RedrawWindow();

 

 }

 

 void CLineNumberStatic::SetFgColor( COLORREF col, BOOL redraw )

 /* ============================================================

 	Function :		CLineNumberStatic::SetFgColor

-	Description :	This function sets the panel foreground 

+	Description :	This function sets the panel foreground

 					color

- 

+

 	Return :		void

 	Parameters :	COLORREF col -	New text color

-					BOOL redraw  -	TRUE if the control 

-									should be redrawn 

+					BOOL redraw  -	TRUE if the control

+									should be redrawn

 									(default)

- 

+

 	Usage :			Called from the parent.

 

    ============================================================*/

 {

 

-	m_fgcol = col;

-	if( m_hWnd && redraw )

-		RedrawWindow();

+    m_fgcol = col;

+    if( m_hWnd && redraw )

+        RedrawWindow();

 

 }

 

 void CLineNumberStatic::SetTopAndBottom( int topline, int bottomline )

 /* ============================================================

 	Function :		CLineNumberStatic::SetTopAndBottom

-	Description :	Sets the top- and bottom line and redraw 

+	Description :	Sets the top- and bottom line and redraw

 					the control (if it exists)

- 

+

 	Return :		void

 	Parameters :	int topline		-	The top line number

 					int bottomline	-	The bottom line number

- 

-	Usage :			Called when the top and bottom line is 

+

+	Usage :			Called when the top and bottom line is

 					changed in the parent.

 

    ============================================================*/

 {

 

-	m_topline = topline;

-	m_bottomline = bottomline;

-	if( m_hWnd )

-		RedrawWindow();

+    m_topline = topline;

+    m_bottomline = bottomline;

+    if( m_hWnd )

+        RedrawWindow();

 

 }

 

@@ -930,17 +936,17 @@ void CLineNumberStatic::SetTopMargin( int topmargin )
 /* ============================================================

 	Function :		CLineNumberStatic::SetTopMargin

 	Description :	Sets the top margin for painting.

- 

+

 	Return :		void

 	Parameters :	int topmargin -	The top margin to set

- 

-	Usage :			Will be called with the value of GetRect 

+

+	Usage :			Will be called with the value of GetRect

 					from the parent.

 

    ============================================================*/

 {

 

-	m_topmargin = topmargin;

+    m_topmargin = topmargin;

 

 }

 

@@ -948,18 +954,18 @@ void CLineNumberStatic::SetLineNumberFormat( CString format )
 /* ============================================================

 	Function :		CLineNumberStatic::SetLineNumberFormat

 	Description :	Sets the format string of the control

- 

+

 	Return :		void

-	Parameters :	CString format -	Format string to use 

- 

-	Usage :			Called from the parent when the format 

+	Parameters :	CString format -	Format string to use

+

+	Usage :			Called from the parent when the format

 					string is changed.

 

    ============================================================*/

 {

 

-	m_format = format;

-	if( m_hWnd )

-		RedrawWindow();

+    m_format = format;

+    if( m_hWnd )

+        RedrawWindow();

 

 }