forgotten DebugBreak()'s in clist_modern

git-svn-id: http://svn.miranda-ng.org/main/trunk@4448 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

3 files changed, 5 insertions, 24 deletions

diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp
index afe5464eef..6b0e46e9da 100644
--- a/plugins/Clist_modern/src/modern_clc.cpp
+++ b/plugins/Clist_modern/src/modern_clc.cpp
@@ -1719,12 +1719,6 @@ static LRESULT clcOnIntmStatusChanged(ClcData *dat, HWND hwnd, UINT msg, WPARAM
 				}

 			}

 		}

-#ifdef _DEBUG

-		else

-		{

-			DebugBreak();

-		}

-#endif

 	}

 

 	if ( db_get_b(NULL,"CList","PlaceOfflineToRoot",SETTING_PLACEOOFLINETOROOT_DEFAULT))

diff --git a/plugins/Clist_modern/src/modern_cluiframes.cpp b/plugins/Clist_modern/src/modern_cluiframes.cpp
index c6cad48918..093a075e0a 100644
--- a/plugins/Clist_modern/src/modern_cluiframes.cpp
+++ b/plugins/Clist_modern/src/modern_cluiframes.cpp
@@ -1932,8 +1932,6 @@ static int _us_DoAddFrame(WPARAM wParam,LPARAM lParam)
 		}

 		GetWindowRect(pcli->hwndContactList,&mainRect);

 		mainHeight = mainRect.bottom-mainRect.top;

-		//if (mainHeight < minHeight)

-		//	  DebugBreak();

 	}

 	_nClientFrameId = eUnknownId;//recalc it

 	CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,0);

diff --git a/plugins/Clist_modern/src/modern_skinengine.cpp b/plugins/Clist_modern/src/modern_skinengine.cpp
index dff93e5aca..d8b90a6ca8 100644
--- a/plugins/Clist_modern/src/modern_skinengine.cpp
+++ b/plugins/Clist_modern/src/modern_skinengine.cpp
@@ -1068,18 +1068,10 @@ HBITMAP ske_CreateDIB32(int cx, int cy)
 

 HBITMAP ske_CreateDIB32Point(int cx, int cy, void ** bits)

 {

-	BITMAPINFO RGB32BitsBITMAPINFO;

-	UINT * ptPixels;

-	HBITMAP DirectBitmap;

-

-	if ( cx < 0 || cy < 0 ) {

-#ifdef _DEBUG

-		DebugBreak();

-#endif

+	if (cx < 0 || cy < 0)

 		return NULL;

-	}

 

-	ZeroMemory(&RGB32BitsBITMAPINFO,sizeof(BITMAPINFO));

+	BITMAPINFO RGB32BitsBITMAPINFO = { 0 };

 	RGB32BitsBITMAPINFO.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);

 	RGB32BitsBITMAPINFO.bmiHeader.biWidth = cx;//bm.bmWidth;

 	RGB32BitsBITMAPINFO.bmiHeader.biHeight = cy;//bm.bmHeight;

@@ -1087,8 +1079,8 @@ HBITMAP ske_CreateDIB32Point(int cx, int cy, void ** bits)
 	RGB32BitsBITMAPINFO.bmiHeader.biBitCount = 32;

 	// pointer used for direct Bitmap pixels access

 

-

-	DirectBitmap = CreateDIBSection(NULL,

+	UINT *ptPixels;

+	HBITMAP DirectBitmap = CreateDIBSection(NULL,

 		(BITMAPINFO *)&RGB32BitsBITMAPINFO,

 		DIB_RGB_COLORS,

 		(void **)&ptPixels,

@@ -1101,7 +1093,7 @@ HBITMAP ske_CreateDIB32Point(int cx, int cy, void ** bits)
 #endif

 		;

 	}

-	else	memset(ptPixels, 0, cx*cy*4);

+	else memset(ptPixels, 0, cx*cy*4);

 	if (bits != NULL) *bits = ptPixels;

 	return DirectBitmap;

 }

@@ -2660,10 +2652,7 @@ static BOOL ske_DrawTextEffect(BYTE* destPt,BYTE* maskPt, DWORD width, DWORD hei
 static int ske_AlphaTextOut (HDC hDC, LPCTSTR lpString, int nCount, RECT *lpRect, UINT format, DWORD ARGBcolor)

 {

 	if ( !( lpString && lpRect ))

-	{

-		DebugBreak();

 		return 0;

-	}

 

 	// Step first fill fast calc correction tables:

 	static bool _tables_empty = true;