- no more "unknown" flags in the extra column;

- options extracted to the separate file;
- version bump

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

1 files changed, 4 insertions, 15 deletions

diff --git a/plugins/CountryFlags/src/icons.cpp b/plugins/CountryFlags/src/icons.cpp
index 7e37254ada..5724db6a8b 100644
--- a/plugins/CountryFlags/src/icons.cpp
+++ b/plugins/CountryFlags/src/icons.cpp
@@ -19,11 +19,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include "flags.h"

 

-extern HINSTANCE hInst;

-extern int nCountriesCount;

-extern struct CountryListEntry *countries;

-static HANDLE hServiceLoadIcon,hServiceCreateMergedIcon;

-

 /************************* Bitmap Access **************************/

 

 static HANDLE *phIconHandles;

@@ -194,9 +189,9 @@ static INT_PTR ServiceCreateMergedFlagIcon(WPARAM wParam,LPARAM lParam)
 

 	/* merge them */

 	ICONINFO icoi;

-	if (GetIconInfo(hLowerIcon,&icoi)) {

+	if (GetIconInfo(hLowerIcon, &icoi)) {

 		BITMAP bm;

-		if (hUpperIcon != NULL && GetObject(icoi.hbmColor,sizeof(bm),&bm)) {

+		if (hUpperIcon != NULL && GetObject(icoi.hbmColor, sizeof(bm), &bm)) {

 			HDC hdc = CreateCompatibleDC(NULL);

 			if (hdc != NULL) {

 				POINT aptTriangle[3] = { 0 };

@@ -269,12 +264,6 @@ void InitIcons(void)
 	}

 

 	/* create services */

-	hServiceLoadIcon = CreateServiceFunction(MS_FLAGS_LOADFLAGICON, ServiceLoadFlagIcon);

-	hServiceCreateMergedIcon = CreateServiceFunction(MS_FLAGS_CREATEMERGEDFLAGICON, ServiceCreateMergedFlagIcon);

-}

-

-void UninitIcons(void)

-{

-	DestroyServiceFunction(hServiceLoadIcon);

-	DestroyServiceFunction(hServiceCreateMergedIcon);

+	CreateServiceFunction(MS_FLAGS_LOADFLAGICON, ServiceLoadFlagIcon);

+	CreateServiceFunction(MS_FLAGS_CREATEMERGEDFLAGICON, ServiceCreateMergedFlagIcon);

 }