[Ttssh2-commit] [4482] Aboutダイアログのエフェクトをスイッチするマクロを整理

svnno****@sourc***** svnno****@sourc*****
2011年 6月 8日 (水) 00:05:04 JST


Revision: 4482
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4482
Author:   maya
Date:     2011-06-08 00:05:03 +0900 (Wed, 08 Jun 2011)

Log Message:
-----------
Aboutダイアログのエフェクトをスイッチするマクロを整理

Modified Paths:
--------------
    trunk/teraterm/ttpdlg/ttdlg.c


-------------- next part --------------
Modified: trunk/teraterm/ttpdlg/ttdlg.c
===================================================================
--- trunk/teraterm/ttpdlg/ttdlg.c	2011-06-06 13:20:00 UTC (rev 4481)
+++ trunk/teraterm/ttpdlg/ttdlg.c	2011-06-07 15:05:03 UTC (rev 4482)
@@ -2665,9 +2665,12 @@
 	char uimsg[MAX_UIMSG], uimsg2[MAX_UIMSG];
 	LOGFONT logfont;
 	HFONT font;
+
+#undef EFFECT_ENABLED	// ƒGƒtƒFƒNƒg‚Ì—LŒø‰Â”Û
+#define TEXTURE_ENABLED	// ƒeƒNƒXƒ`ƒƒ‚Ì—LŒø‰Â”Û
+
+#if defined(EFFECT_ENABLED) || defined(TEXTURE_ENABLED)
 	// for animation
-//#define EFFECT_ENABLED        // ƒGƒtƒFƒNƒg‚Ì—LŒø‰Â”Û
-#define TEXTURE_ENABLED             // ƒeƒNƒXƒ`ƒƒ‚Ì—LŒø‰Â”Û
 	static HDC dlgdc = NULL;
 	static int dlgw, dlgh;
 	static HBITMAP dlgbmp = NULL, dlgprevbmp = NULL;
@@ -2686,6 +2689,7 @@
 	static int waveflag = 0;
 	static int fullcolor = 0;
 	int bitspixel;
+#endif
 
 	switch (Message) {
 		case WM_INITDIALOG:
@@ -2723,14 +2727,16 @@
 					fuLoad = LR_VGACOLOR;
 				}
 
+#if defined(EFFECT_ENABLED) || defined(TEXTURE_ENABLED)
 				hicon = LoadImage(hInst, MAKEINTRESOURCE(IDI_TTERM),
-								  IMAGE_ICON, icon_w, icon_h, fuLoad);
-#if 0
-				SendDlgItemMessage(Dialog, IDC_TT_ICON, STM_SETICON, (WPARAM)hicon, 0);
-#else
+				                  IMAGE_ICON, icon_w, icon_h, fuLoad);
 				// Picture Control ‚É•`‰æ‚·‚é‚ƁA‚È‚º‚©“§‰ßF‚ª“§‰ß‚ɂȂ炸A•‚Æ‚È‚Á‚Ä‚µ‚Ü‚¤‚½‚߁A
 				// WM_PAINT ‚Å•`‰æ‚·‚éB
 				dlghicon = hicon;
+#else
+				hicon = LoadImage(hInst, MAKEINTRESOURCE(IDI_TTERM),
+				                  IMAGE_ICON, 32, 32, fuLoad);
+				SendDlgItemMessage(Dialog, IDC_TT_ICON, STM_SETICON, (WPARAM)hicon, 0);
 #endif
 			}
 
@@ -2814,6 +2820,7 @@
 			do_subclass_window(GetDlgItem(Dialog, IDC_AUTHOR_URL), &author_url_class);
 			do_subclass_window(GetDlgItem(Dialog, IDC_FORUM_URL), &forum_url_class);
 
+#if defined(EFFECT_ENABLED) || defined(TEXTURE_ENABLED)
 			/*
 			 * ƒ_ƒCƒAƒƒO‚̃rƒbƒgƒ}ƒbƒv‰»‚ðs‚¢A”wŒi‚ɃGƒtƒFƒNƒg‚ð‚©‚¯‚ç‚ê‚é‚悤‚É‚·‚éB
 			 * (2011.5.7 yutaka)
@@ -2866,19 +2873,19 @@
 			bitspixel = GetDeviceCaps(hdc, BITSPIXEL);
 			fullcolor = (bitspixel == 32 ? 1 : 0);
 			ReleaseDC(hwnd, hdc);
+#endif
 
 			return TRUE;
 
 		case WM_COMMAND:
+#ifdef EFFECT_ENABLED
 			switch (LOWORD(wParam)) {
 				int val;
 				case IDOK:
 					val = 1;
 				case IDCANCEL:
 					val = 0;
-#ifdef EFFECT_ENABLED
 					KillTimer(Dialog, ID_EFFECT_TIMER);
-#endif
 
 					SelectObject(dlgdc, dlgprevbmp);
 					DeleteObject(dlgbmp);
@@ -2893,11 +2900,22 @@
 					EndDialog(Dialog, val);
 					return TRUE;
 			}
+#else
+			switch (LOWORD(wParam)) {
+				case IDOK:
+					EndDialog(Dialog, 1);
+					return TRUE;
+				case IDCANCEL:
+					EndDialog(Dialog, 0);
+					return TRUE;
+			}
+#endif
 			if (DlgAboutFont != NULL) {
 				DeleteObject(DlgAboutFont);
 			}
 			break;
 
+#if defined(EFFECT_ENABLED) || defined(TEXTURE_ENABLED)
 		// static text‚Ì”wŒi‚𓧉߂³‚¹‚éB
 		case WM_CTLCOLORSTATIC:
 			SetBkMode((HDC)wParam, TRANSPARENT);
@@ -2914,7 +2932,6 @@
 				PAINTSTRUCT ps;
 				hdc = BeginPaint(Dialog, &ps);
 
-#if defined(EFFECT_ENABLED) || defined(TEXTURE_ENABLED)
 				if (fullcolor) {
 					BitBlt(hdc, 
 						ps.rcPaint.left, ps.rcPaint.top, 
@@ -2923,7 +2940,6 @@
 						ps.rcPaint.left, ps.rcPaint.top, 
 						SRCCOPY);
 				}
-#endif
 
 				DrawIconEx(hdc, icon_x, icon_y, dlghicon, icon_w, icon_h, 0, 0, DI_NORMAL);
 
@@ -2996,6 +3012,7 @@
 				InvalidateRect(Dialog, NULL, FALSE);
 			}
 			break;
+#endif
 
 	}
 	return FALSE;



Ttssh2-commit メーリングリストの案内