window: move some members from protected to private section

2 files changed, 27 insertions, 27 deletions

diff --git a/src/window.cpp b/src/window.cpp
index e2cb4e3f..c69cadc1 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -71,20 +71,20 @@ Window::Window(size_t startx,
 		Border border)
 		: itsWindow(0),
 		itsWinBorder(0),
-		itsGetStringHelper(0),
 		itsStartX(startx),
 		itsStartY(starty),
 		itsWidth(width),
 		itsHeight(height),
 		itsWindowTimeout(-1),
-		itsX(0),
-		itsY(0),
-		itsTitle(title),
 		itsColor(color),
 		itsBgColor(clDefault),
 		itsBaseColor(color),
 		itsBaseBgColor(clDefault),
 		itsBorder(border),
+		itsGetStringHelper(0),
+		itsX(0),
+		itsY(0),
+		itsTitle(title),
 		itsHistory(0),
 		itsBoldCounter(0),
 		itsUnderlineCounter(0),
@@ -121,21 +121,21 @@ Window::Window(size_t startx,
 
 Window::Window(const Window &w) : itsWindow(dupwin(w.itsWindow)),
 				itsWinBorder(dupwin(w.itsWinBorder)),
-				itsGetStringHelper(w.itsGetStringHelper),
 				itsStartX(w.itsStartX),
 				itsStartY(w.itsStartY),
 				itsWidth(w.itsWidth),
 				itsHeight(w.itsHeight),
 				itsWindowTimeout(w.itsWindowTimeout),
-				itsX(w.itsX),
-				itsY(w.itsY),
-				itsTitle(w.itsTitle),
-				itsColors(w.itsColors),
 				itsColor(w.itsColor),
 				itsBgColor(w.itsBgColor),
 				itsBaseColor(w.itsBaseColor),
 				itsBaseBgColor(w.itsBaseBgColor),
 				itsBorder(w.itsBorder),
+				itsGetStringHelper(w.itsGetStringHelper),
+				itsX(w.itsX),
+				itsY(w.itsY),
+				itsTitle(w.itsTitle),
+				itsColors(w.itsColors),
 				itsHistory(w.itsHistory),
 				itsBoldCounter(w.itsBoldCounter),
 				itsUnderlineCounter(w.itsUnderlineCounter),
diff --git a/src/window.h b/src/window.h
index f401f143..81edafa4 100644
--- a/src/window.h
+++ b/src/window.h
@@ -500,11 +500,6 @@ namespace NCurses
 			WINDOW *itsWindow;
 			WINDOW *itsWinBorder;
 			
-			/// pointer to helper function used by GetString()
-			/// @see GetString()
-			///
-			GetStringHelper itsGetStringHelper;
-			
 			/// start points and dimensions
 			size_t itsStartX;
 			size_t itsStartY;
@@ -514,19 +509,6 @@ namespace NCurses
 			/// window timeout
 			int itsWindowTimeout;
 			
-			/// temporary coordinates
-			/// @see X()
-			/// @see Y()
-			///
-			int itsX;
-			int itsY;
-			
-			/// window's title
-			std::string itsTitle;
-			
-			/// stack of colors
-			std::stack<Colors> itsColors;
-			
 			/// current colors
 			Color itsColor;
 			Color itsBgColor;
@@ -559,6 +541,24 @@ namespace NCurses
 			///
 			void AltCharset(bool altcharset_state) const;
 			
+			/// pointer to helper function used by GetString()
+			/// @see GetString()
+			///
+			GetStringHelper itsGetStringHelper;
+			
+			/// temporary coordinates
+			/// @see X()
+			/// @see Y()
+			///
+			int itsX;
+			int itsY;
+			
+			/// window's title
+			std::string itsTitle;
+			
+			/// stack of colors
+			std::stack<Colors> itsColors;
+			
 			/// pointer to container used as history
 			std::deque<std::wstring> *itsHistory;