Skip to content

Commit 9848e39

Browse files
committed
adapt to MSYS2
1 parent f71045c commit 9848e39

File tree

6 files changed

+7
-4
lines changed

6 files changed

+7
-4
lines changed

HowToBuild-JP.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
- MSYS2
1111

1212
このソリューションは、C++11以降が必須である。
13+
ATLサポートのためには、Visual C++が必須である。
1314
MSYS2でもビルドできるが、その場合、XPでは実行できなくなってしまう。
1415

1516
Inno Setupはインストーラ作成のときに使う。

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ You have to copy the 64-bit file into another place before loading.
253253
- Fixed a bug that `RT_DLGINIT` disappears without permission.
254254
- v.5.4.7 (2020.XX.YY)
255255
- Downgraded Inno Setup to 5.6.1 for XP support.
256-
- Initial support of ActiveX window class "AtlAxWin140".
256+
- Initial support of ActiveX window class "AtlAxWin140" on test dialog.
257257

258258
## Contact Us
259259

README.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ Question 6. Are the 64-bit files supported?
245245
- Fixed a bug that RT_DLGINIT disappears without permission.
246246
- v.5.4.7 (2020.XX.YY)
247247
- Downgraded Inno Setup to 5.6.1 for XP support.
248-
- Initial support of ActiveX window class "AtlAxWin140".
248+
- Initial support of ActiveX window class "AtlAxWin140" on test dialog.
249249

250250
/////////////////////////////////////////////////////////////////////
251251
Katayama Hirofumi MZ (katahiromz) [A.N.T.]

READMEIT.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ Domanda 6. I file a 64 bit sono supportati?
246246
- Corretto bug per cui RT_DLGINIT senza permsso scompariva.
247247
- v.5.4.7 (YY.XX.2020)
248248
- Downgraded Inno Setup to 5.6.1 for XP support.
249-
- Initial support of ActiveX window class "AtlAxWin140".
249+
- Initial support of ActiveX window class "AtlAxWin140" on test dialog.
250250

251251
/////////////////////////////////////////////////////////////////////
252252
// Katayama Hirofumi MZ (katahiromz) [A.N.T.]

READMEJP.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,7 @@
588588
RT_DLGINITが勝手に消えるバグを修正。
589589
v.5.4.7 (2020.XX.YY)
590590
XPサポートのため、Inno Setupを5.6.1にダウングレード。
591-
ActiveXウィンドウクラス「AtlAxWin140」の初期サポート。
591+
テストダイアログでActiveXウィンドウクラス「AtlAxWin140」の初期サポート。
592592

593593
/////////////////////////////////////////////////////
594594
// 片山博文MZ (katahiromz) [A.N.T.]

src/MTestDialog.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
//////////////////////////////////////////////////////////////////////////////
3030

31+
#ifdef ATL_SUPPORT
3132
template <class StringType, class Helper, typename Helper::ReturnType(WINAPI* pFunc)(HINSTANCE, LPCDLGTEMPLATE, HWND, DLGPROC, LPARAM)>
3233
typename Helper::ReturnType AtlAxDialogCreateIndirectT(
3334
HINSTANCE hInstance,
@@ -50,6 +51,7 @@ typename Helper::ReturnType AtlAxDialogCreateIndirectT(
5051
}
5152
return nRet;
5253
}
54+
#endif
5355

5456
class MTestDialog : public MDialogBase
5557
{

0 commit comments

Comments
 (0)