diff --git a/PowerEditor/src/Notepad_plus.rc b/PowerEditor/src/Notepad_plus.rc index 1f10edc5..38180858 100644 --- a/PowerEditor/src/Notepad_plus.rc +++ b/PowerEditor/src/Notepad_plus.rc @@ -898,6 +898,7 @@ BEGIN CONTROL "",IDI_CHAMELEON,"Static",SS_OWNERDRAW,20,5,64,64 //CONTROL "",IDI_JESUISCHARLIE,"Static",SS_OWNERDRAW,20,5,64,64 LTEXT NOTEPAD_PLUS_VERSION, IDC_STATIC,70,20,140,11 + LTEXT "bit",IDC_VERSION_BIT,150,20,140,11 LTEXT "Author :",IDC_STATIC,21,45,31,8 LTEXT "Notepad++ team",IDC_AUTHOR_NAME,78,45,70,8 LTEXT "Home Page :",IDC_STATIC,21,59,47,8 diff --git a/PowerEditor/src/Parameters.cpp b/PowerEditor/src/Parameters.cpp index 605510bb..db86b61b 100644 --- a/PowerEditor/src/Parameters.cpp +++ b/PowerEditor/src/Parameters.cpp @@ -961,6 +961,8 @@ bool NppParameters::load() for (int i = 0 ; i < NB_LANG ; _langList[i] = NULL, ++i) {} + _isx64 = sizeof(void *) == 8; + // Make localConf.xml path generic_string localConfPath(_nppPath); PathAppend(localConfPath, localConfFile); diff --git a/PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp b/PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp index 4085b1d4..387b45c8 100644 --- a/PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp +++ b/PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp @@ -47,6 +47,10 @@ INT_PTR CALLBACK AboutDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lPara buildTime += TEXT(" - "); buildTime += wmc->char2wchar(__TIME__, CP_ACP); + NppParameters *pNppParam = NppParameters::getInstance(); + LPCTSTR bitness = pNppParam ->isx64() ? TEXT("(64-bit)") : TEXT("(32-bit)"); + ::SetDlgItemText(_hSelf, IDC_VERSION_BIT, bitness); + ::SendMessage(compileDateHandle, WM_SETTEXT, 0, (LPARAM)buildTime.c_str()); ::EnableWindow(compileDateHandle, FALSE); @@ -62,7 +66,6 @@ INT_PTR CALLBACK AboutDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lPara getClientRect(_rc); - NppParameters *pNppParam = NppParameters::getInstance(); ETDTProc enableDlgTheme = (ETDTProc)pNppParam->getEnableThemeDlgTexture(); if (enableDlgTheme) { diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h index 72a75e46..bfc4a926 100644 --- a/PowerEditor/src/resource.h +++ b/PowerEditor/src/resource.h @@ -284,6 +284,7 @@ #define IDC_ONLINEHELP_ADDR 1704 #define IDC_AUTHOR_NAME 1705 #define IDC_BUILD_DATETIME 1706 //LS: CompileDateInAboutDialog: Automatically insert compile date as additional version info in About-dialog! +#define IDC_VERSION_BIT 1707 #define IDD_DEBUGINFOBOX 1750 #define IDC_DEBUGINFO_EDIT 1751