Changeset 828 in dev for trunk/ab5.0/abdev/abdev/abdev.cpp

Timestamp:

Mar 19, 2012, 1:59:48 AM (12 years ago)

Author:

イグトランス (egtra)

Message:

egtraブランチの内容をマージ。

Location:

trunk

Files:

• . (modified) (1 prop)
• ab5.0/abdev (modified) (1 prop)
• ab5.0/abdev/abdev/abdev.cpp (modified) (5 diffs)

trunk/ab5.0/abdev/abdev/abdev.cpp

@@ -2 +2 @@
 
 #include "abdev.h"
+
+#if _ATL_VER == 0x0800
+#pragma comment(lib, "atlthunk.lib")
+#endif
 
 #ifdef _DEBUG
@@ -910 +914 @@
     SHFILEINFO shfi;
     if(filepath)
+    {
         SHGetFileInfo(filepath, FILE_ATTRIBUTE_ARCHIVE, &shfi, sizeof(SHFILEINFO), SHGFI_ICON | SHGFI_SMALLICON );
-    else shfi.hIcon=(HICON)LoadImage(hResInst,MAKEINTRESOURCE(IDI_TEXTDOCUMENT),IMAGE_ICON,16,16,LR_DEFAULTCOLOR);;
+    }
+    else
+    {
+        shfi.hIcon = ActiveBasic::Resource::LoadIconAlt(hResInst, IDI_TEXTDOCUMENT, 16, 16, LR_DEFAULTCOLOR);
+    }
     mdic.lParam=(LPARAM)shfi.hIcon;
 
@@ -1489 +1498 @@
     return RegisterClassEx(&wcl);
 }
+
+#ifndef AB_TEST
+
 int PASCAL WinMain(HINSTANCE hThisInst,HINSTANCE,LPSTR lpCmdLine,int ShowCmd){
 #ifdef _DEBUG
@@ -1540 +1552 @@
     //return 0;
 
-
-    hAccel=LoadAccelerators(hResInst,MAKEINTRESOURCE(IDR_ACCELERATOR1));
+    hAccel = ActiveBasic::Resource::LoadAcceleratorsAlt(hResInst, IDR_ACCELERATOR1);
 
     //メインウィンドウ
@@ -1644 +1655 @@
     return static_cast<int>(msg.wParam);
 }
+
+#endif