diff --git a/PowerEditor/src/Notepad_plus.rc b/PowerEditor/src/Notepad_plus.rc index ca89f6aca..5a1c79275 100644 --- a/PowerEditor/src/Notepad_plus.rc +++ b/PowerEditor/src/Notepad_plus.rc @@ -65,7 +65,7 @@ IDI_M30ICON ICON "icons/npp.ico" IDI_CHAMELEON ICON "icons/chameleon.ico" //IDI_JESUISCHARLIE ICON "icons/Je_suis_Charlie.ico" //IDI_GILETJAUNE ICON "icons/giletJaune.ico" -IDI_SAMESEXMARRIAGE ICON "icons/same-sexMarriageTaiwan.ico" +//IDI_SAMESEXMARRIAGE ICON "icons/same-sexMarriageTaiwan.ico" IDI_NEW_OFF_ICON ICON "icons/new_off.ico" IDI_OPEN_OFF_ICON ICON "icons/open_off.ico" IDI_SAVE_OFF_ICON ICON "icons/save_off.ico" @@ -1009,7 +1009,7 @@ BEGIN CONTROL "",IDI_CHAMELEON,"Static",SS_OWNERDRAW,20,5,64,64 //CONTROL "",IDI_JESUISCHARLIE,"Static",SS_OWNERDRAW,20,5,64,64 //CONTROL "",IDI_GILETJAUNE,"Static",SS_OWNERDRAW,20,5,64,64 - CONTROL "", IDI_SAMESEXMARRIAGE,"Static",SS_OWNERDRAW,20,5,64,64 + //CONTROL "", IDI_SAMESEXMARRIAGE,"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 diff --git a/PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp b/PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp index 53ad022a8..59800eb49 100644 --- a/PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp +++ b/PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp @@ -78,10 +78,10 @@ INT_PTR CALLBACK AboutDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lPara case WM_DRAWITEM : { - //HICON hIcon = (HICON)::LoadImage(_hInst, MAKEINTRESOURCE(IDI_CHAMELEON), IMAGE_ICON, 64, 64, LR_DEFAULTSIZE); + HICON hIcon = (HICON)::LoadImage(_hInst, MAKEINTRESOURCE(IDI_CHAMELEON), IMAGE_ICON, 64, 64, LR_DEFAULTSIZE); //HICON hIcon = (HICON)::LoadImage(_hInst, MAKEINTRESOURCE(IDI_JESUISCHARLIE), IMAGE_ICON, 64, 64, LR_DEFAULTSIZE); //HICON hIcon = (HICON)::LoadImage(_hInst, MAKEINTRESOURCE(IDI_GILETJAUNE), IMAGE_ICON, 64, 64, LR_DEFAULTSIZE); - HICON hIcon = (HICON)::LoadImage(_hInst, MAKEINTRESOURCE(IDI_SAMESEXMARRIAGE), IMAGE_ICON, 64, 64, LR_DEFAULTSIZE); + //HICON hIcon = (HICON)::LoadImage(_hInst, MAKEINTRESOURCE(IDI_SAMESEXMARRIAGE), IMAGE_ICON, 64, 64, LR_DEFAULTSIZE); DRAWITEMSTRUCT *pdis = (DRAWITEMSTRUCT *)lParam; ::DrawIconEx(pdis->hDC, 0, 0, hIcon, 64, 64, 0, NULL, DI_NORMAL); return TRUE; diff --git a/PowerEditor/src/icons/giletJaune.ico b/PowerEditor/src/icons/giletJaune.ico deleted file mode 100644 index 1fc924ecf..000000000 Binary files a/PowerEditor/src/icons/giletJaune.ico and /dev/null differ diff --git a/PowerEditor/src/icons/same-sexMarriageTaiwan.ico b/PowerEditor/src/icons/same-sexMarriageTaiwan.ico deleted file mode 100644 index c45e4e396..000000000 Binary files a/PowerEditor/src/icons/same-sexMarriageTaiwan.ico and /dev/null differ diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h index c41b7e0da..c28621dd8 100644 --- a/PowerEditor/src/resource.h +++ b/PowerEditor/src/resource.h @@ -44,7 +44,7 @@ #define IDI_CHAMELEON 101 //#define IDI_JESUISCHARLIE 102 //#define IDI_GILETJAUNE 102 -#define IDI_SAMESEXMARRIAGE 102 +//#define IDI_SAMESEXMARRIAGE 102 #define IDR_RT_MANIFEST 103 #define IDI_NEW_OFF_ICON 201