diff --git a/PowerEditor/src/Notepad_plus.rc b/PowerEditor/src/Notepad_plus.rc index 29b992a3..09e08a85 100644 --- a/PowerEditor/src/Notepad_plus.rc +++ b/PowerEditor/src/Notepad_plus.rc @@ -66,7 +66,6 @@ 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_FUCK_CCP_VIRUS ICON "icons/fuckCcpVirus.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" @@ -1015,11 +1014,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_BORDER | WS_SYSMENU FONT 8, TEXT("MS Shell Dlg"), 0, 0, 0x1 BEGIN EDITTEXT IDC_BUILD_DATETIME,150,2,150,10, ES_READONLY | NOT WS_BORDER - //CONTROL "",IDI_CHAMELEON,"Static",SS_OWNERDRAW,20,5,64,64 + 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_FUCK_CCP_VIRUS,"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 05919afd..374219a5 100644 --- a/PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp +++ b/PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp @@ -81,11 +81,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_FUCK_CCP_VIRUS), 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/fuckCcpVirus.ico b/PowerEditor/src/icons/fuckCcpVirus.ico deleted file mode 100644 index 0cab7415..00000000 Binary files a/PowerEditor/src/icons/fuckCcpVirus.ico and /dev/null differ diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h index 3937d766..45a1b87e 100644 --- a/PowerEditor/src/resource.h +++ b/PowerEditor/src/resource.h @@ -41,11 +41,10 @@ #endif #define IDI_M30ICON 100 -//#define IDI_CHAMELEON 101 +#define IDI_CHAMELEON 101 //#define IDI_JESUISCHARLIE 102 //#define IDI_GILETJAUNE 102 //#define IDI_SAMESEXMARRIAGE 102 -#define IDI_FUCK_CCP_VIRUS 102 #define IDR_RT_MANIFEST 103 #define IDI_NEW_OFF_ICON 201