From 567662b3c3022fcb695ba78180689ff516f1a136 Mon Sep 17 00:00:00 2001
From: Brian Fiete <bfiete@gmail.com>
Date: Sat, 21 Mar 2020 07:10:16 -0700
Subject: [PATCH] Renamed Windows Application to GUI Application

---
 IDE/src/BuildContext.bf | 12 ++++++------
 IDE/src/IDEApp.bf       |  9 ++++++---
 IDE/src/Project.bf      | 21 ++++++++++++++++-----
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/IDE/src/BuildContext.bf b/IDE/src/BuildContext.bf
index dfd18117..bfafd520 100644
--- a/IDE/src/BuildContext.bf
+++ b/IDE/src/BuildContext.bf
@@ -282,8 +282,8 @@ namespace IDE
 					linkLine.Append(" ");
 			    }*/
 
-			    if ((project.mGeneralOptions.mTargetType == Project.TargetType.BeefWindowsApplication) ||
-			        (project.mGeneralOptions.mTargetType == Project.TargetType.C_WindowsApplication))
+			    if ((project.mGeneralOptions.mTargetType == Project.TargetType.BeefGUIApplication) ||
+			        (project.mGeneralOptions.mTargetType == Project.TargetType.C_GUIApplication))
 			    {
 			        linkLine.Append("-mwindows ");
 			    }
@@ -591,9 +591,9 @@ namespace IDE
 
 				if (testProjectInfo != null)
 					linkLine.Append("-subsystem:console ");
-			    else if (project.mGeneralOptions.mTargetType == .BeefWindowsApplication)
+			    else if (project.mGeneralOptions.mTargetType == .BeefGUIApplication)
 					linkLine.Append("-subsystem:windows ");
-			    else if (project.mGeneralOptions.mTargetType == .C_WindowsApplication)
+			    else if (project.mGeneralOptions.mTargetType == .C_GUIApplication)
 			    	linkLine.Append("-subsystem:console ");
 				else if (project.mGeneralOptions.mTargetType == .BeefDynLib)
 				{
@@ -687,8 +687,8 @@ namespace IDE
 					linkLine.Append("-nodefaultlib ");
 
 					String minRTModName = scope String();
-					if ((project.mGeneralOptions.mTargetType == .BeefWindowsApplication) ||
-						(project.mGeneralOptions.mTargetType == .C_WindowsApplication))
+					if ((project.mGeneralOptions.mTargetType == .BeefGUIApplication) ||
+						(project.mGeneralOptions.mTargetType == .C_GUIApplication))
 						minRTModName.Append("g");
 					if (options.mBuildOptions.mBeefLibType == .DynamicDebug)
 						minRTModName.Append("d");
diff --git a/IDE/src/IDEApp.bf b/IDE/src/IDEApp.bf
index 3cb78868..78ff493b 100644
--- a/IDE/src/IDEApp.bf
+++ b/IDE/src/IDEApp.bf
@@ -3736,6 +3736,9 @@ namespace IDE
                 int lineChar;
                 sourceViewPanel.mEditWidget.Content.GetCursorLineChar(out line, out lineChar);
 
+				if (!sourceViewPanel.HasTextAtCursor())
+					return;
+
 #if IDE_C_SUPPORT
                 if (sourceViewPanel.mIsClang)
                 {
@@ -8647,7 +8650,7 @@ namespace IDE
 								newString = scope:ReplaceBlock String();
 
 								if ((project.mGeneralOptions.mTargetType == .BeefConsoleApplication) ||
-									(project.mGeneralOptions.mTargetType == .BeefWindowsApplication) ||
+									(project.mGeneralOptions.mTargetType == .BeefGUIApplication) ||
 									(project.mGeneralOptions.mTargetType == .BeefDynLib) ||
 									((options.mBuildOptions.mBuildKind == .Test) && (project == mWorkspace.mStartupProject)))
 								{
@@ -9005,7 +9008,7 @@ namespace IDE
 
 #if BF_PLATFORM_WINDOWS
 			if ((project.mGeneralOptions.mTargetType == .BeefConsoleApplication) ||
-				(project.mGeneralOptions.mTargetType == .BeefWindowsApplication))
+				(project.mGeneralOptions.mTargetType == .BeefGUIApplication))
 			{
 				if (workspaceOptions.mToolsetType != .GNU)
 				{
@@ -9990,7 +9993,7 @@ namespace IDE
 				// temporarily break on _main and then we single step                                    
 				//mMainBreakpoint = mDebugger.CreateSymbolBreakpoint("_ZN3Hey4Dude3Bro9TestClass4MainEv");
                 if ((project.mGeneralOptions.mTargetType == Project.TargetType.BeefConsoleApplication) ||
-                    (project.mGeneralOptions.mTargetType == Project.TargetType.BeefWindowsApplication))
+                    (project.mGeneralOptions.mTargetType == Project.TargetType.BeefGUIApplication))
                     mMainBreakpoint = mDebugger.CreateSymbolBreakpoint("-BeefStartProgram");
                 else
 				{
diff --git a/IDE/src/Project.bf b/IDE/src/Project.bf
index 663b310a..d8f3b2b8 100644
--- a/IDE/src/Project.bf
+++ b/IDE/src/Project.bf
@@ -864,12 +864,12 @@ namespace IDE
         public enum TargetType
         {
 			case BeefConsoleApplication,
-				 BeefWindowsApplication,
+				 BeefGUIApplication,
 				 BeefLib,
 				 BeefDynLib,
 				 CustomBuild,
 				 C_ConsoleApplication,
-				 C_WindowsApplication,
+				 C_GUIApplication,
 				 BeefTest,
 				 BeefApplication_StaticLib,
 				 BeefApplication_DynamicLib;
@@ -881,7 +881,7 @@ namespace IDE
 					switch (this)
 					{
 					case BeefConsoleApplication,
-						 BeefWindowsApplication,
+						 BeefGUIApplication,
 						 BeefLib,
 						 BeefDynLib,
 						 BeefTest:
@@ -899,7 +899,7 @@ namespace IDE
 					switch (this)
 					{
 					case BeefConsoleApplication,
-						 BeefWindowsApplication:
+						 BeefGUIApplication:
 						return true;
 					default:
 						return false;
@@ -1783,7 +1783,18 @@ namespace IDE
 					typeOptions.Deserialize(data);
 					mBeefGlobalOptions.mDistinctBuildOptions.Add(typeOptions);
 				}
-				mGeneralOptions.mTargetType = data.GetEnum<TargetType>("TargetType", GetDefaultTargetType());
+
+				var targetTypeName = scope String();
+				data.GetString("TargetType", targetTypeName);
+				switch (targetTypeName)
+				{ // Handle Legacy names first
+				case "BeefWindowsApplication":
+					mGeneralOptions.mTargetType = .BeefGUIApplication;
+				case "C_WindowsApplication":
+					mGeneralOptions.mTargetType = .C_GUIApplication;
+				default:
+					mGeneralOptions.mTargetType = data.GetEnum<TargetType>("TargetType", GetDefaultTargetType());
+				}
 			}
 
 			using (data.Open("Platform"))