From a9d533e447d6514c4838c1f7cd3df08c4a57d0a9 Mon Sep 17 00:00:00 2001
From: andreja6 <andrejaandjic@hotmail.com>
Date: Tue, 24 Apr 2018 19:35:53 -0700
Subject: [PATCH] YAY

---
 Dialogs.aps    | Bin 34160 -> 35196 bytes
 Dialogs.rc     |   9 +++++++++
 G3DTest.vcproj |   4 ++++
 icon1.ico      | Bin 0 -> 4286 bytes
 main.cpp       |  13 ++++++-------
 resource.h     |   3 ++-
 6 files changed, 21 insertions(+), 8 deletions(-)
 create mode 100644 icon1.ico

diff --git a/Dialogs.aps b/Dialogs.aps
index d31b93976558fc97b03ae56c2e7e4be29d6067a9..88ed17ca41767131de2d86db3ca39e21df317d99 100644
GIT binary patch
delta 1183
zcmcgrF^dyX5S~rUorfSfiDwY?B4?q^ksPOjSmcruE{#^ll@?Z7cv@ux2fHDA$*xVz
zJwkR0O=D#tNGiJs7UzFZxKax-R!Jc|zj>QI4QT6R=goZc&3iNNkr_Qp{5(iJ-%NgL
zk~%70d;4UsWF4q)rB|84Iu-IasIpnPUn$?aTOgth)h(}B-v{r?YgXnrA!!MVEIQeF
zf5Eyrn7{M+))vw)L9al!XopI$T7Se!lus|D6ULL+Y3L(bNI#?pv`devK&uq_l5$Et
zbuSO*+|{J>1$%M`X`O^x!kVLugXJnT2Q5M^I)N1u*MXa!s)UJL^O5U{2gMK0a5#jO
zh&CSzi3in=_)twX775{MTWo}TQ_N1l-R*4-9jzw;65HJIZQo~LpR+#qIa`HrTTi&t
zs>V3z3ypZ6cgEm@{)D?Nv3yRj6ZCxc4Z&FrTkCOH1rzjxENYL@M$6GojL}xMim=TQ
z4-6XVC?LJ*T37{(4*P+@b{4cWe2jI3L&H1T#+Apmk1N-r4UF@3)dud!fnzCvK#gOJ
zei5+Qmdk@jhX_pmz_<eN<d~N`2yRdFnLEzdV4NTaL;;jSg7!n-4}2s{F<u2?a8LND
z2p<~81n|Z>U~G*gU_AYdpr;wZK4*GZWbmK(&r+VPmjTQ{;{g&@21{%tGLgAl+RTE?
zjzxRwdSig`{@PecZQLe0REyqnM#ePn&W@?dc^S)7FT9It&OMV_Ldpk&n%+_(T~{x?
wwZwW|y>ZW{UV|H{AKtQcq!#zf^IHvRYNU4SXN%J0Ve{WjN?Svd|M!vp1?Q97KL7v#

delta 140
zcmew}iRnWZ(*zf0lV*m=4;(Z%7SuQ~Hco!)w1kC$fk9{TQfFnxcbiW-8!=8iB+Y2H
zS;zIR)#iYP0A@ys$#>f}1C>r}S7y_(VPM$dJb9I~94j|ao5W<s4r9g$ASpXJs6&i#
o37GY-L5OV*Q1(Q_<ar%(j4hM*cE~f9OupOU%yg$|vR<<k0O_qU^Z)<=

diff --git a/Dialogs.rc b/Dialogs.rc
index bc28737..9763a82 100644
--- a/Dialogs.rc
+++ b/Dialogs.rc
@@ -123,6 +123,15 @@ BEGIN
 END
 #endif    // APSTUDIO_INVOKED
 
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_ICON1               ICON                    "icon1.ico"
 #endif    // English (Canada) resources
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/G3DTest.vcproj b/G3DTest.vcproj
index 41d451f..79a70d6 100644
--- a/G3DTest.vcproj
+++ b/G3DTest.vcproj
@@ -316,6 +316,10 @@
 			Name="Resource Files"
 			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
 			>
+			<File
+				RelativePath=".\icon1.ico"
+				>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>
diff --git a/icon1.ico b/icon1.ico
new file mode 100644
index 0000000000000000000000000000000000000000..5423a6a0dbcaf755c2dd01c3fdd91809a72d3ef9
GIT binary patch
literal 4286
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
HU!VUI(y$bj

literal 0
HcmV?d00001

diff --git a/main.cpp b/main.cpp
index 137d5ca..bc935e9 100644
--- a/main.cpp
+++ b/main.cpp
@@ -631,7 +631,8 @@ void Demo::onSimulation(RealTime rdt, SimTime sdt, SimTime idt) {
 	if(dataModel->name != title)
 	{
 		title = dataModel->name;
-		app->renderDevice->setCaption("Game \"" + title + "\"");
+		std::string text = "Game \"" + title + "\"";
+		SetWindowText(app->getMainHWND(), text.c_str());
 	}
 
 	CoordinateFrame frame = app->debugCamera.getCoordinateFrame();
@@ -1214,14 +1215,8 @@ int main(int argc, char** argv) {
 	//_CrtSetBreakAlloc(1279);
 
     GAppSettings settings;
-	if(getOSVersion() > 5.0)
-		settings.window.defaultIconFilename = GetFileInPath("/content/images/rico.png");
-	else
-		settings.window.defaultIconFilename = GetFileInPath("/content/images/rico256c.png");
 	settings.window.resizable = true;
 	settings.writeLicenseFile = false;
-	settings.window.width = 841;
-	settings.window.height = 639;
 	//Using the damned SDL window now
 	SDLWindow* wnd = new SDLWindow(settings.window);
 	//wnd->setInputCaptureCount(200);
@@ -1290,6 +1285,10 @@ int main(int argc, char** argv) {
 	
 	//SetWindowLong(hwnd, GWL_STYLE, WS_VISIBLE | WS_CHILD);
 	SetWindowLongPtr(hwndMain, GWL_USERDATA, (LONG)&app);
+
+	HICON hicon = (HICON)LoadImage(GetModuleHandleW(NULL), (LPCSTR)MAKEINTRESOURCEW(IDI_ICON1), IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR | LR_DEFAULTSIZE);
+	SendMessage(hwndMain, WM_SETICON, ICON_BIG, (LPARAM)hicon);
+
 	app.run();
     return 0;
 }
diff --git a/resource.h b/resource.h
index 7259ef5..56d9469 100644
--- a/resource.h
+++ b/resource.h
@@ -4,13 +4,14 @@
 //
 #define IDD_ABOUT_DIALOG                102
 #define IDD_TOOLBOX                     103
+#define IDI_ICON1                       106
 #define IDC_TOOLBOX_BROWSER             1001
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        106
+#define _APS_NEXT_RESOURCE_VALUE        107
 #define _APS_NEXT_COMMAND_VALUE         40004
 #define _APS_NEXT_CONTROL_VALUE         1002
 #define _APS_NEXT_SYMED_VALUE           101