github
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

One more country in which same-sex marriage is legal. Congrats Taiwan!

Browse Source
pull/5673/head
Don HO 6 years ago
parent 1a438ddc61
commit 6d365d89c0
No known key found for this signature in database
GPG Key ID: 6C429F1D8D84F46E
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File

2
PowerEditor/src/Notepad_plus.rc
Unescape View File

@ -65,6 +65,7 @@ IDI_M30ICON ICON "icons/npp.ico"
IDI_CHAMELEON ICON "icons/chameleon.ico" IDI_CHAMELEON ICON "icons/chameleon.ico"
//IDI_JESUISCHARLIE ICON "icons/Je_suis_Charlie.ico" //IDI_JESUISCHARLIE ICON "icons/Je_suis_Charlie.ico"
//IDI_GILETJAUNE ICON "icons/giletJaune.ico" //IDI_GILETJAUNE ICON "icons/giletJaune.ico"
IDI_SAMESEXMARRIAGE ICON "icons/same-sexMarriageTaiwan.ico"
IDI_NEW_OFF_ICON ICON "icons/new_off.ico" IDI_NEW_OFF_ICON ICON "icons/new_off.ico"
IDI_OPEN_OFF_ICON ICON "icons/open_off.ico" IDI_OPEN_OFF_ICON ICON "icons/open_off.ico"
IDI_SAVE_OFF_ICON ICON "icons/save_off.ico" IDI_SAVE_OFF_ICON ICON "icons/save_off.ico"
@ -1008,6 +1009,7 @@ BEGIN
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_JESUISCHARLIE,"Static",SS_OWNERDRAW,20,5,64,64
//CONTROL "",IDI_GILETJAUNE,"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
LTEXT NOTEPAD_PLUS_VERSION, IDC_STATIC,70,20,140,11 LTEXT NOTEPAD_PLUS_VERSION, IDC_STATIC,70,20,140,11
LTEXT "bit",IDC_VERSION_BIT,150,20,140,11 LTEXT "bit",IDC_VERSION_BIT,150,20,140,11
LTEXT "Author :",IDC_STATIC,21,45,31,8 LTEXT "Author :",IDC_STATIC,21,45,31,8

3
PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp
Unescape View File

@ -78,9 +78,10 @@ INT_PTR CALLBACK AboutDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lPara
case WM_DRAWITEM : 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_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_GILETJAUNE), IMAGE_ICON, 64, 64, LR_DEFAULTSIZE);
HICON hIcon = (HICON)::LoadImage(_hInst, MAKEINTRESOURCE(IDI_SAMESEXMARRIAGE), IMAGE_ICON, 64, 64, LR_DEFAULTSIZE);
DRAWITEMSTRUCT *pdis = (DRAWITEMSTRUCT *)lParam; DRAWITEMSTRUCT *pdis = (DRAWITEMSTRUCT *)lParam;
::DrawIconEx(pdis->hDC, 0, 0, hIcon, 64, 64, 0, NULL, DI_NORMAL); ::DrawIconEx(pdis->hDC, 0, 0, hIcon, 64, 64, 0, NULL, DI_NORMAL);
return TRUE; return TRUE;

BIN
PowerEditor/src/icons/same-sexMarriageTaiwan.ico
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 104 KiB

2
PowerEditor/src/resource.h
Unescape View File

@ -44,7 +44,7 @@
#define IDI_CHAMELEON 101 #define IDI_CHAMELEON 101
//#define IDI_JESUISCHARLIE 102 //#define IDI_JESUISCHARLIE 102
//#define IDI_GILETJAUNE 102 //#define IDI_GILETJAUNE 102
#define IDI_SAMESEXMARRIAGE 102
#define IDR_RT_MANIFEST 103 #define IDR_RT_MANIFEST 103
#define IDI_NEW_OFF_ICON 201 #define IDI_NEW_OFF_ICON 201

Write Preview
Loading…
Cancel
Save