From 318513b721b9794b6a91b880b75e5a00be039ded Mon Sep 17 00:00:00 2001
From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Sat, 26 Nov 2016 22:58:15 +0000
Subject: [PATCH] main.cpp: Exit on -h and load application icon.

---
 source/main.cpp | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/source/main.cpp b/source/main.cpp
index 849a52c..2faffa9 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -27,6 +27,7 @@
 #include <curl/curl.h>
 
 #include "version.h"
+#include "bitmaps.h"
 #include "forms/main/frmMain.h"
 
 class XestiaCALApp: public wxApp
@@ -39,6 +40,8 @@ IMPLEMENT_APP(XestiaCALApp);
 bool XestiaCALApp::OnInit()
 {
 
+	wxInitAllImageHandlers();
+	
 	static const wxCmdLineEntryDesc g_cmdLineDesc [] =
 	{
 		{ wxCMD_LINE_SWITCH, "h", "help", "Displays help on command line parameters",
@@ -56,6 +59,14 @@ bool XestiaCALApp::OnInit()
 	wxCmdLineParser XCALArgs (g_cmdLineDesc, argc, argv);
 	XCALArgs.Parse();
 	
+	if (XCALArgs.Found(wxT("h"))){
+    
+		// Print out the list of help commands.
+    
+		return false;
+    
+	}
+	
 	if (XCALArgs.Found(wxT("v"))){
     
 		// Print out the version number.    
@@ -66,6 +77,15 @@ bool XestiaCALApp::OnInit()
 	}
 	
 	frmMain *frame = new frmMain( NULL );
+	
+	wxMemoryInputStream istream(bigimgs_appicon48_png, sizeof(bigimgs_appicon48_png));
+	wxImage bigimgs_appicon48i(istream, wxBITMAP_TYPE_PNG);
+	wxBitmap appiconbmp(bigimgs_appicon48i, -1);    
+	wxIcon appicon;
+    
+	appicon.CopyFromBitmap(appiconbmp);
+	
+	frame->SetIcon(appicon);
 	frame->Show(true);
 	
 	SetTopWindow(frame);
-- 
2.39.2