From 1bd3ca0288fe4a5694f0975bef070209126d97fb Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@4f64403b-2f21-0410-a795-97e2b3489a10>
Date: Mon, 13 Dec 2010 01:07:10 +0000
Subject: Fixes for mingw

git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@583 4f64403b-2f21-0410-a795-97e2b3489a10
---
 yapp/YAPP.mdsp        | 22 ++++++++++------------
 yapp/common.h         |  2 +-
 yapp/message_pump.cpp |  4 ++--
 yapp/services.cpp     |  6 +++---
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/yapp/YAPP.mdsp b/yapp/YAPP.mdsp
index ba8a6f5..9c94778 100644
--- a/yapp/YAPP.mdsp
+++ b/yapp/YAPP.mdsp
@@ -1,7 +1,7 @@
 [Project]
 name=YAPP
 type=2
-defaultConfig=0
+defaultConfig=1
 
 
 [Debug]
@@ -28,7 +28,7 @@ optimizeLevel=0
 // linker
 libraryPath=
 outputFilename=Debug\yapp.dll
-libraries=unicows,gdi32,comctl32
+libraries=unicows,gdi32
 extraLinkerOptions=
 ignoreStartupFile=0
 ignoreDefaultLibs=0
@@ -50,23 +50,23 @@ intermediateFilesDirectory=Release
 outputFilesDirectory=Release
 compilerPreprocessor=_UNICODE,UNICODE,POPUPS2_EXPORTS
 extraCompilerOptions=
-compilerIncludeDirectory=..\..\include
+compilerIncludeDirectory=..\..\include,docs
 noWarning=0
-defaultWarning=0
-allWarning=1
+defaultWarning=1
+allWarning=0
 extraWarning=0
 isoWarning=0
 warningAsErrors=0
 debugType=0
 debugLevel=1
-exceptionEnabled=1
-runtimeTypeEnabled=1
-optimizeLevel=2
+exceptionEnabled=0
+runtimeTypeEnabled=0
+optimizeLevel=4
 
 // linker
 libraryPath=
 outputFilename=Release\yapp.dll
-libraries=unicows,gdi32,comctl32
+libraries=unicows,gdi32
 extraLinkerOptions=
 ignoreStartupFile=0
 ignoreDefaultLibs=0
@@ -88,8 +88,7 @@ extraResourceOptions=
 5=popwin.cpp
 6=services.cpp
 7=popup_history.cpp
-8=str_utils.cpp
-9=popup_history_dlg.cpp
+8=popup_history_dlg.cpp
 [Header]
 1=message_pump.h
 2=notify.h
@@ -101,7 +100,6 @@ extraResourceOptions=
 8=version.h
 9=popup_history.h
 10=common.h
-11=str_utils.h
 [Resource]
 1=resource.rc
 2=version.rc
diff --git a/yapp/common.h b/yapp/common.h
index d1da6cd..f3f98c8 100644
--- a/yapp/common.h
+++ b/yapp/common.h
@@ -35,7 +35,7 @@
 #include <commctrl.h>
 #include <time.h>
 
-#define MIRANDA_VER		0x0700
+#define MIRANDA_VER		0x0800
 
 #include <newpluginapi.h>
 #include <statusmodes.h>
diff --git a/yapp/message_pump.cpp b/yapp/message_pump.cpp
index f3c8faf..2ece03c 100644
--- a/yapp/message_pump.cpp
+++ b/yapp/message_pump.cpp
@@ -34,7 +34,7 @@ bool is_full_screen() {
 	}
 	
 	// check other top level windows
-	while (hWnd = FindWindowEx(NULL, hWnd, NULL, NULL)) {
+	while ((hWnd = FindWindowEx(NULL, hWnd, NULL, NULL))) {
 		if(IsWindowVisible(hWnd) == 0 || IsIconic(hWnd) || hWnd == hWndDesktop || hWnd == hWndShell)
 			continue;
 			
@@ -57,7 +57,7 @@ bool is_full_screen() {
 bool is_workstation_locked()
 {
 	bool rc = false;
-	HDESK hDesk = OpenDesktop(_T("default"), 0, FALSE, DESKTOP_SWITCHDESKTOP);
+	HDESK hDesk = OpenDesktop((TCHAR*)_T("default"), 0, FALSE, DESKTOP_SWITCHDESKTOP);
 	if(hDesk != 0) {
 		HDESK hDeskInput = OpenInputDesktop(0, FALSE, DESKTOP_SWITCHDESKTOP);
 		if(hDeskInput == 0) {
diff --git a/yapp/services.cpp b/yapp/services.cpp
index 84213ab..05aa859 100644
--- a/yapp/services.cpp
+++ b/yapp/services.cpp
@@ -244,7 +244,7 @@ INT_PTR IsSecondLineShown(WPARAM wParam, LPARAM lParam) {
 void UpdateMenu() {
 	CLISTMENUITEM menu = {0};
 	menu.cbSize = sizeof(CLISTMENUITEM);
-	menu.pszName = (DBGetContactSettingByte(0, MODULE, "Enabled", 1) == 1 ? "Disable Popups" : "Enable Popups");
+	menu.pszName = (char*)(DBGetContactSettingByte(0, MODULE, "Enabled", 1) == 1 ? LPGEN("Disable Popups") : LPGEN("Enable Popups"));
 	menu.flags = CMIM_NAME;// | CMIM_ICON;
 	CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hMenuToggleOnOff, (LPARAM)&menu);
 }
@@ -497,8 +497,8 @@ void InitServices() {
 	
 	menu.hIcon = NULL;
 	menu.pszService = "PopUp/ToggleEnabled";
-	menu.pszName = DBGetContactSettingByte(0, MODULE, "Enabled", 1) ? 
-		LPGEN("Disable Popups") : LPGEN("Enable Popups");
+	menu.pszName = (char*)(DBGetContactSettingByte(0, MODULE, "Enabled", 1) ? 
+		LPGEN("Disable Popups") : LPGEN("Enable Popups"));
 	hMenuToggleOnOff = (HANDLE)CallService(MS_CLIST_ADDMAINMENUITEM, 0, (LPARAM)&menu);
 
 	hEventBuildMenu = HookEvent(ME_CLIST_PREBUILDCONTACTMENU, PrebuildMenu);
-- 
cgit v1.2.3