Fixed broken font settings (fixes #658)

String "%s (colors only)" must be translated manually for each


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

1 files changed, 4 insertions, 11 deletions

diff --git a/plugins/Popup/src/popup_gdiplus.cpp b/plugins/Popup/src/popup_gdiplus.cpp
index a3ce6ce41f..f024eaa31e 100644
--- a/plugins/Popup/src/popup_gdiplus.cpp
+++ b/plugins/Popup/src/popup_gdiplus.cpp
@@ -71,14 +71,11 @@ using namespace Gdiplus;
 

 HBITMAP SkinEngine_CreateDIB32(int cx, int cy)

 {

-    BITMAPINFO RGB32BitsBITMAPINFO; 

-    UINT * ptPixels;

-    HBITMAP DirectBitmap;

-

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

         return NULL;

     }

 

+    BITMAPINFO RGB32BitsBITMAPINFO; 

     ZeroMemory(&RGB32BitsBITMAPINFO,sizeof(BITMAPINFO));

     RGB32BitsBITMAPINFO.bmiHeader.biSize=sizeof(BITMAPINFOHEADER);

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

@@ -88,11 +85,8 @@ HBITMAP SkinEngine_CreateDIB32(int cx, int cy)
     // pointer used for direct Bitmap pixels access

 

 

-    DirectBitmap = CreateDIBSection(NULL, 

-        (BITMAPINFO *)&RGB32BitsBITMAPINFO, 

-        DIB_RGB_COLORS,

-        (void **)&ptPixels, 

-        NULL, 0);

+    UINT *ptPixels;

+    HBITMAP DirectBitmap = CreateDIBSection(NULL, &RGB32BitsBITMAPINFO, DIB_RGB_COLORS, (void **)&ptPixels,  NULL, 0);

     if ((DirectBitmap == NULL || ptPixels == NULL) && cx!= 0 && cy!=0) 

     {

         ;

@@ -109,9 +103,8 @@ BOOL GDIPlus_IsAnimatedGIF(TCHAR * szName)
 {

 	int nFrameCount=0;

 	Image image(szName);

-	UINT count = 0;

 

-	count = image.GetFrameDimensionsCount();

+	UINT count = image.GetFrameDimensionsCount();

 	GUID* pDimensionIDs = new GUID[count];

 

 	// Get the list of frame dimensions from the Image object.