Add icon for taskbar, but failed to add icon for title bar

Author: YooLc

compiled/CodeEditor_private.res

@@ -818,7 +818,7 @@ void repaint()
 
 static void InitDisplay(void)
 {
-    WNDCLASS wndcls;
+    WNDCLASSEX wndcls;
     RECT bounds, consoleRect, graphicsRect;
     double screenHeight, screenWidth, xSpace, ySpace;
     double xScale, yScale, scaleFactor;
@@ -857,18 +857,20 @@ static void InitDisplay(void)
 	g_mouse = NULL;
 	g_timer = NULL;
 
+    wndcls.cbSize = sizeof(WNDCLASSEX);
     wndcls.cbClsExtra = 0;
     wndcls.cbWndExtra = 0;
     wndcls.hbrBackground = (HBRUSH)GetStockObject(WHITE_BRUSH);
     wndcls.hCursor = LoadCursor(NULL, IDC_ARROW);
-    wndcls.hIcon = LoadIcon(NULL, IDI_APPLICATION);
+    wndcls.hIcon = (HICON)LoadImage(NULL, "IDI_ICON", IMAGE_ICON, GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON), 0);
+    wndcls.hIconSm = (HICON)LoadImage(NULL, "IDI_ICON", IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0);
     wndcls.hInstance = NULL;
     wndcls.lpfnWndProc = GraphicsEventProc;
     wndcls.lpszClassName = "Graphics Window";
     wndcls.lpszMenuName = NULL;
     wndcls.style = CS_HREDRAW | CS_VREDRAW;
 
-    RegisterClass(&wndcls);
+    RegisterClassEx(&wndcls);
 
     graphicsWindow = CreateWindow(
       GWClassName,

lib/graphics.c

@@ -29,7 +29,7 @@ IncludeVersionInfo=0
 SupportXPThemes=0
 CompilerSet=0
 CompilerSettings=0000000000000000001000000
-UnitCount=43
+UnitCount=45
 
 [VersionInfo]
 Major=1
@@ -450,8 +450,8 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit44]
-FileName=..\src\ioutils.h
+[Unit31]
+FileName=..\src\menu.h
 CompileCpp=0
 Folder=src
 Compile=1
@@ -460,8 +460,8 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit31]
-FileName=..\src\menu.h
+[Unit32]
+FileName=..\src\menu.c
 CompileCpp=0
 Folder=src
 Compile=1
@@ -470,20 +470,29 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit32]
-FileName=..\src\menu.c
+[Unit43]
+FileName=..\res\icon.ico
+Folder=res
+Compile=0
+Link=0
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit45]
+FileName=..\res\icon.h
 CompileCpp=0
-Folder=src
+Folder=res
 Compile=1
 Link=1
 Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit43]
-FileName=..\res\OIG.ico
+[Unit44]
+FileName=..\res\icon.rc
 Folder=res
-Compile=0
+Compile=1
 Link=0
 Priority=1000
 OverrideBuildCmd=0

prjdev/CodeEditor.dev

@@ -1,5 +1,6 @@
 /* THIS FILE WILL BE OVERWRITTEN BY DEV-C++ */
 /* DO NOT EDIT! */
 
+#include "../res/icon.rc"
 
 A ICON "CodeEditor.ico"

prjdev/CodeEditor_private.rc

@@ -0,0 +1 @@
+#define IDI_ICON 20000

res/icon.h

@@ -0,0 +1,2 @@
+#include "icon.h"
+IDI_ICON ICON "../res/icon.ico"