From c9d3a66c9db2a299685d975eb17ff875af300b82 Mon Sep 17 00:00:00 2001
From: Rainer Kottenhoff <rainer.kottenhoff@gmail.com>
Date: Thu, 22 Nov 2018 16:36:37 +0100
Subject: [PATCH] + fix: missing titlebar icon for some dialogs

---
 src/ChooseFont/ChooseFont.cpp | 2 ++
 src/Dialogs.c                 | 3 +++
 src/Styles.c                  | 9 ++++-----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/ChooseFont/ChooseFont.cpp b/src/ChooseFont/ChooseFont.cpp
index faf430ee4..e1d1d4aeb 100644
--- a/src/ChooseFont/ChooseFont.cpp
+++ b/src/ChooseFont/ChooseFont.cpp
@@ -667,6 +667,8 @@ BOOL ChooseFontDialog::OnInitDialog(HWND dialog, HWND hwndFocus, LPARAM lParam)
 {
   m_dialog = dialog;
 
+  if (Globals.hDlgIcon) { SendMessage(dialog, WM_SETICON, ICON_SMALL, (LPARAM)Globals.hDlgIcon); }
+
   HWND hwndFamilyNames = GetDlgItem(dialog, IDC_FONT_FAMILY_NAMES);
   HWND hwndSizes = GetDlgItem(dialog, IDC_FONT_SIZE);
 
diff --git a/src/Dialogs.c b/src/Dialogs.c
index 53e2f9b89..b33689274 100644
--- a/src/Dialogs.c
+++ b/src/Dialogs.c
@@ -286,6 +286,7 @@ INT_PTR CALLBACK CmdLineHelpProc(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lPa
   switch (umsg) {
   case WM_INITDIALOG:
     {
+      if (Globals.hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)Globals.hDlgIcon); }
       //WCHAR szTitle[80] = { L'\0' };
       //GetLngString(IDS_MUI_APPTITLE, szTitle, COUNTOF(szTitle));
       //SetWindowText(hwnd, szTitle);
@@ -509,6 +510,8 @@ INT_PTR CALLBACK AboutDlgProc(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam
   case WM_INITDIALOG:
   {
     {
+      if (Globals.hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)Globals.hDlgIcon); }
+
       if (!hIcon) {
         hIcon = LoadImage(Globals.hInstance, MAKEINTRESOURCE(IDR_MAINWND), IMAGE_ICON, 128, 128, LR_DEFAULTCOLOR);
       }
diff --git a/src/Styles.c b/src/Styles.c
index 156e374d8..465fa0287 100644
--- a/src/Styles.c
+++ b/src/Styles.c
@@ -3125,11 +3125,11 @@ INT_PTR CALLBACK Style_CustomizeSchemesDlgProc(HWND hwnd,UINT umsg,WPARAM wParam
   {
     case WM_INITDIALOG:
       {
+        if (Globals.hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)Globals.hDlgIcon); }
         GetLngString(IDS_MUI_STYLEEDIT_HELP, wchText, COUNTOF(wchText));
         SetDlgItemText(hwnd, IDC_STYLEEDIT_HELP, wchText);
 
         // Backup Styles
-        if (Globals.hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)Globals.hDlgIcon); }
         ZeroMemory(&Style_StylesBackup, NUMLEXERS * AVG_NUM_OF_STYLES_PER_LEXER * sizeof(WCHAR*));
         int cnt = 0;
         for (int iLexer = 0; iLexer < COUNTOF(g_pLexArray); ++iLexer) {
@@ -3771,11 +3771,9 @@ INT_PTR CALLBACK Style_SelectLexerDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPAR
   {
     case WM_INITDIALOG:
       {
-        LVCOLUMN lvc = { LVCF_FMT|LVCF_TEXT, LVCFMT_LEFT, 0, L"", -1, 0, 0, 0 };
-
-        WCHAR tch[MAX_PATH] = { L'\0' };
-
         if (Globals.hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)Globals.hDlgIcon); }
+        
+        LVCOLUMN lvc = { LVCF_FMT|LVCF_TEXT, LVCFMT_LEFT, 0, L"", -1, 0, 0, 0 };
 
         RECT rc;
         GetClientRect(hwnd,&rc);
@@ -3795,6 +3793,7 @@ INT_PTR CALLBACK Style_SelectLexerDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPAR
         SetWindowLongPtr(hwnd,GWL_STYLE,GetWindowLongPtr(hwnd,GWL_STYLE)|WS_THICKFRAME);
         SetWindowPos(hwnd,NULL,0,0,0,0,SWP_NOZORDER|SWP_NOMOVE|SWP_NOSIZE|SWP_FRAMECHANGED);
 
+        WCHAR tch[MAX_PATH] = { L'\0' };
         GetMenuString(GetSystemMenu(GetParent(hwnd),false),SC_SIZE,tch,COUNTOF(tch),MF_BYCOMMAND);
         InsertMenu(GetSystemMenu(hwnd,false),SC_CLOSE,MF_BYCOMMAND|MF_STRING|MF_ENABLED,SC_SIZE,tch);
         InsertMenu(GetSystemMenu(hwnd,false),SC_CLOSE,MF_BYCOMMAND|MF_SEPARATOR,0,NULL);