From 0f47c03197973aa330d25d1fcf6bcb6b843a141c Mon Sep 17 00:00:00 2001
From: Gerald Schmidt <gnschmidt@users.sourceforge.net>
Date: Fri, 13 Feb 2009 15:35:42 +0000
Subject: [PATCH] Updated to bring Linux build into line with Win 1.2.0.3

---
 src/housestyle.cpp    | 4 ++--
 src/wrapaspell.h      | 4 ++--
 src/xmlcopyeditor.cpp | 6 ++----
 src/xmlctrl.cpp       | 2 --
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/housestyle.cpp b/src/housestyle.cpp
index 4fff899..4c6370d 100755
--- a/src/housestyle.cpp
+++ b/src/housestyle.cpp
@@ -209,9 +209,9 @@ bool HouseStyle::createReport()
 	try {
 		if (type == HS_TYPE_SPELL)
 			spellcheck = new WrapAspell(
-            ruleFile // carries lang information
+            ruleFile, // carries lang information
 #ifdef __WXMSW__
-                , aspellDataPath,
+                aspellDataPath,
                 aspellDictPath
 #endif            
              );
diff --git a/src/wrapaspell.h b/src/wrapaspell.h
index 05f134d..d038825 100755
--- a/src/wrapaspell.h
+++ b/src/wrapaspell.h
@@ -29,9 +29,9 @@ class WrapAspell
 {
 	public:
 		WrapAspell (
-                   std::string lang// = "en_US",
+                   std::string lang,// = "en_US",
 #ifdef __WXMSW__
-                   , const std::string& aspellDataPathParameter,
+                   const std::string& aspellDataPathParameter,
                    const std::string& aspellDictPath
 #endif
                    );
diff --git a/src/xmlcopyeditor.cpp b/src/xmlcopyeditor.cpp
index d9117ca..b4b808e 100755
--- a/src/xmlcopyeditor.cpp
+++ b/src/xmlcopyeditor.cpp
@@ -2275,11 +2275,9 @@ void MyFrame::OnSplitTab ( wxCommandEvent& event )
 	    if ( currentSelection == -1 )
 	        return;
 	*/
-
 	int currentSelection, direction;
 	currentSelection = mainBook->GetSelection();
 	direction = wxAUI_NB_RIGHT;
-
 	switch ( id )
 	{
 			    ID_SPLIT_TAB_TOP:
@@ -4966,13 +4964,13 @@ wxMenuBar *MyFrame::getMenuBar()
 			break;
 	}
 
-	 /* WAIT FOR AUI LIBRARY TO SUPPORT THIS - currently always splits left */
+	 /* WAIT FOR AUI LIBRARY TO SUPPORT THIS - currently always splits left
 	wxMenu *splitTabMenu = new wxMenu;
 	splitTabMenu->Append ( ID_SPLIT_TAB_TOP, _ ( "&Top" ), _ ( "Top" ));
 	splitTabMenu->Append ( ID_SPLIT_TAB_RIGHT, _ ( "&Right" ), _ ( "Right" ));
 	splitTabMenu->Append ( ID_SPLIT_TAB_BOTTOM, _ ( "&Bottom" ), _ ( "Bottom" ));
 	splitTabMenu->Append ( ID_SPLIT_TAB_LEFT, _ ( "&Left" ), _ ( "Left" ));
-	 /**/
+	 */
 
 	viewMenu = new wxMenu; // use class-wide data member
 	viewMenu->Append ( ID_PREVIOUS_DOCUMENT, _ ( "&Previous Document\tCtrl+PgUp" ), _ ( "Previous Document" ) );
diff --git a/src/xmlctrl.cpp b/src/xmlctrl.cpp
index 3fa1aac..103f7f4 100755
--- a/src/xmlctrl.cpp
+++ b/src/xmlctrl.cpp
@@ -354,7 +354,6 @@ void XmlCtrl::handleDelete ( wxKeyEvent& event )
 	startLine = LineFromPosition ( start );
 	endLine = LineFromPosition ( end );
 	
-	/* commented out: redundant as covered by shift-tab
 	// add test so range unindentation only happens when caret is flush with left margin
 	int column = GetColumn ( GetCurrentPos() );
 	
@@ -382,7 +381,6 @@ void XmlCtrl::handleDelete ( wxKeyEvent& event )
 			return;
 		}
 	}
-	*/
 
 	if ( !canMoveRightAt ( GetCurrentPos() ) &&
 	        GetSelectionStart() == GetSelectionEnd() )