From 8e96244bdf77c6103c43351c874350521549631c Mon Sep 17 00:00:00 2001
From: fcolin
Date: Thu, 1 Feb 2007 13:08:31 +0000
Subject:  Utilisateur : Fcolin       Date : 18/11/05   Heure : 11:46 Archivé
 dans $/Bus/IvyProbe Commentaire:  (vss 4)

---
 Bus/IvyProbe/ETSLayout.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'Bus')

diff --git a/Bus/IvyProbe/ETSLayout.cpp b/Bus/IvyProbe/ETSLayout.cpp
index 921e129..994c5ce 100644
--- a/Bus/IvyProbe/ETSLayout.cpp
+++ b/Bus/IvyProbe/ETSLayout.cpp
@@ -545,8 +545,10 @@ void ETSLayoutMgr::EraseBkgnd(CDC* pDC)
 		pWndChild = pWndChild->GetNextWindow();
 	}
 
-
-	HBRUSH hBrBack = (HBRUSH) ::GetClassLong(GetWnd()->GetSafeHwnd(), GCL_HBRBACKGROUND) ;
+	HBRUSH hBrBack = 0;
+#ifdef GCL_HBRBACKGROUND
+	hBrBack = (HBRUSH) ::GetClassLong(GetWnd()->GetSafeHwnd(), GCL_HBRBACKGROUND) ;
+#endif
 	if( hBrBack == 0 )
 		hBrBack = ::GetSysColorBrush(COLOR_BTNFACE);
 
@@ -1366,7 +1368,7 @@ bool ETSLayoutMgr::Pane::resizeToRelative(int& availSpace, CArray<int,int>& size
 		// come to endless looping. Save the amount of space actually distributed in this iteration
 		int relDist = 0;
 
-		for(i=0; i<m_paneItems.GetSize(); ++i) {
+		for(int i=0; i<m_paneItems.GetSize(); ++i) {
 			
 			CPaneBase pItem = m_paneItems[i];
 
@@ -1429,7 +1431,7 @@ bool ETSLayoutMgr::Pane::resizeToRelative(int& availSpace, CArray<int,int>& size
 	}
 
 	// Fixup Relative: invert all negative (limited) sized to correct value
-	for(i=0; i<m_paneItems.GetSize(); ++i) {
+	for(int i=0; i<m_paneItems.GetSize(); ++i) {
 		CPaneBase pItem = m_paneItems[i];
 		if( (m_Orientation==HORIZONTAL && (pItem->modeResize() & RELATIVE_HORZ) && sizePrimary[i] < 0)
 			||
@@ -1555,7 +1557,7 @@ bool ETSLayoutMgr::Pane::resizeToGreedy(int& availSpace, int nGreedy, CArray<int
 		// at least on not limited item present
 		bAtLeastOne = false;
 
-		for(i=0; i<m_paneItems.GetSize(); ++i) {
+		for(int i=0; i<m_paneItems.GetSize(); ++i) {
 			CPaneBase pItem = m_paneItems[i];
 
 
@@ -1633,7 +1635,7 @@ bool ETSLayoutMgr::Pane::resizeToGreedy(int& availSpace, int nGreedy, CArray<int
 		// still difference, some space left
 
 		// are there any items which are minimum-limited where we can give more space?
-		for(i=0; i<m_paneItems.GetSize() && greedyDiff!=0; ++i) {
+		for(int i=0; i<m_paneItems.GetSize() && greedyDiff!=0; ++i) {
 			CPaneBase pItem = m_paneItems[i];
 
 			if( (m_Orientation==HORIZONTAL 
@@ -1665,7 +1667,7 @@ bool ETSLayoutMgr::Pane::resizeToGreedy(int& availSpace, int nGreedy, CArray<int
 
 
 	// Fixup Greedy III: invert all negative (limited) sized to correct value
-	for(i=0; i<m_paneItems.GetSize(); ++i) {
+	for(int i=0; i<m_paneItems.GetSize(); ++i) {
 		CPaneBase pItem = m_paneItems[i];
 
 		if( (m_Orientation==HORIZONTAL 
-- 
cgit v1.1