From e2f8d82e522b755358ce87b5b407a9c039dfdba8 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Tue, 22 Dec 2009 23:42:20 -0800
Subject: [PATCH] Use recursive-lambda icon as default on windows.

---
 src/microcode/ntscreen.c                         |   8 +++++---
 src/microcode/ntutl/ntgui.rc                     |   1 +
 src/{etc/windows => microcode/ntutl}/schlogo.ico | Bin
 3 files changed, 6 insertions(+), 3 deletions(-)
 rename src/{etc/windows => microcode/ntutl}/schlogo.ico (100%)

diff --git a/src/microcode/ntscreen.c b/src/microcode/ntscreen.c
index 4cb6bff05..3559e445b 100644
--- a/src/microcode/ntscreen.c
+++ b/src/microcode/ntscreen.c
@@ -68,6 +68,8 @@ typedef struct tagSCREEN_EVENT_LINK
 #define MAX_LINEINPUT 1024
 
 #define COMPUTE_SCROLL_LINES(height)    ((((height) * 2) + 4) / 5)
+
+#define DEFAULT_ICON "DEFAULT_ICON"
 
 typedef struct tagSCREENINFO
 {
@@ -379,7 +381,7 @@ Screen_InitApplication (HANDLE hInstance)
    wndclass.cbClsExtra =    0;
    wndclass.cbWndExtra =    SCREENEXTRABYTES;
    wndclass.hInstance =     hInstance;
-   wndclass.hIcon =         (LoadIcon (hInstance, "SHIELD3_ICON"));
+   wndclass.hIcon =         (LoadIcon (hInstance, DEFAULT_ICON));
    wndclass.hCursor =       (LoadCursor (NULL, IDC_ARROW));
    wndclass.hbrBackground = 0;
    wndclass.lpszMenuName =  0;
@@ -412,7 +414,7 @@ BOOL
 Screen_InitInstance (HANDLE hInstance, int nCmdShow )
 {
   ghInstance = hInstance;
-  ghDefaultIcon = LoadIcon (hInstance, "SHIELD2_ICON");
+  ghDefaultIcon = LoadIcon (hInstance, DEFAULT_ICON);
   return  TRUE;
 }
 
@@ -847,7 +849,7 @@ CreateScreenInfo (HWND hWnd)
 
    screen->hWnd                 = hWnd;
    screen->hIcon                =
-     LoadIcon ((HINSTANCE) GetWindowLong(hWnd,GWL_HINSTANCE), "SHIELD3_ICON");
+     LoadIcon ((HINSTANCE) GetWindowLong(hWnd,GWL_HINSTANCE), DEFAULT_ICON);
    screen->chars                = NULL;
    screen->attrs                = NULL;
    screen->write_attribute      = 0;
diff --git a/src/microcode/ntutl/ntgui.rc b/src/microcode/ntutl/ntgui.rc
index 6b862fd24..53a05e52f 100644
--- a/src/microcode/ntutl/ntgui.rc
+++ b/src/microcode/ntutl/ntgui.rc
@@ -2,6 +2,7 @@
 #include "ntgui.h"
 #include "ntdialog.h"
 
+DEFAULT_ICON ICON schlogo.ico
 SHIELD3_ICON ICON shield3.ico
 SHIELD4_ICON ICON shield4.ico
 SHIELD2_ICON ICON shield2.ico
diff --git a/src/etc/windows/schlogo.ico b/src/microcode/ntutl/schlogo.ico
similarity index 100%
rename from src/etc/windows/schlogo.ico
rename to src/microcode/ntutl/schlogo.ico
-- 
2.25.1