Re-enable the built-in terminal on all platforms

eranif · Mar 20, 2018 · 2c9fe13 · 2c9fe13
1 parent c72f5fd
commit 2c9fe13
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 21 deletions.
diff --git a/LiteEditor.workspace b/LiteEditor.workspace
@@ -81,25 +81,29 @@
   <BuildMatrix>
     <WorkspaceConfiguration Name="Win_x86_Release" Selected="no">
       <Environment/>
+      <Project Name="abbreviation" ConfigName="Win_x86_Release"/>
       <Project Name="AutoSave" ConfigName="Win_x86_Release"/>
-      <Project Name="CCTest" ConfigName="Debug"/>
-      <Project Name="CMakePlugin" ConfigName="Win_x86_Release"/>
       <Project Name="CallGraph" ConfigName="Win_x86_Release"/>
+      <Project Name="CMakePlugin" ConfigName="Win_x86_Release"/>
       <Project Name="CodeFormatter" ConfigName="Win_x86_Release"/>
+      <Project Name="codelite_vim" ConfigName="Win_x86_Release"/>
       <Project Name="CodeLiteDiff" ConfigName="Win_x86_Release"/>
       <Project Name="CodeLiteIDE" ConfigName="Win_x86_Release"/>
       <Project Name="ContinuousBuild" ConfigName="Win_x86_Release"/>
       <Project Name="Copyright" ConfigName="Win_x86_Release"/>
       <Project Name="CppChecker" ConfigName="Win_x86_Release"/>
       <Project Name="Cscope" ConfigName="Win_x86_Release"/>
-      <Project Name="CxxParserTests" ConfigName="Debug"/>
       <Project Name="DatabaseExplorer" ConfigName="Win_x86_Release"/>
+      <Project Name="databaselayer_sqlite" ConfigName="Win_x86_Release"/>
       <Project Name="DebuggerGDB" ConfigName="Win_x86_Release"/>
       <Project Name="EditorConfigPlugin" ConfigName="Win_x64_Release"/>
       <Project Name="ExternalTools" ConfigName="Win_x86_Release"/>
+      <Project Name="git" ConfigName="Win_x86_Release"/>
       <Project Name="Gizmos" ConfigName="Win_x86_Release"/>
       <Project Name="HelpPlugin" ConfigName="Win_x86_Release"/>
+      <Project Name="hunspell" ConfigName="Release"/>
       <Project Name="Interfaces" ConfigName="Common"/>
+      <Project Name="libCodeLite" ConfigName="Win_x86_Release"/>
       <Project Name="LLDBApp" ConfigName="Win_x64_Debug"/>
       <Project Name="LLDBDebugger" ConfigName="Win_x86_Release"/>
       <Project Name="LLDBProtocol" ConfigName="Win_x64_Debug"/>
@@ -112,30 +116,26 @@
       <Project Name="PHPParserUnitTests" ConfigName="Release"/>
       <Project Name="PHPPlugin" ConfigName="Win_x86_Release"/>
       <Project Name="PHPRefactoring" ConfigName="Win_x86_Release"/>
+      <Project Name="plugin_sdk" ConfigName="Win_x86_Release"/>
       <Project Name="QMakePlugin" ConfigName="Win_x86_Release"/>
       <Project Name="SFTP" ConfigName="Win_x86_Release"/>
-      <Project Name="SampleWorksapce" ConfigName="Debug"/>
-      <Project Name="SmartCompletion" ConfigName="Win_x86_Release"/>
+      <Project Name="snipwiz" ConfigName="Win_x86_Release"/>
       <Project Name="SpellCheck" ConfigName="Win_x86_Release"/>
+      <Project Name="sqlite3" ConfigName="Common"/>
       <Project Name="Subversion2" ConfigName="Win_x86_Release"/>
       <Project Name="Tail" ConfigName="Win_x86_Release"/>
       <Project Name="Tweaks" ConfigName="Win_x86_Release"/>
       <Project Name="UnitTestPP" ConfigName="Win_x86_Release"/>
       <Project Name="WebTools" ConfigName="Win_x86_Release"/>
       <Project Name="WordCompletion" ConfigName="Win_x86_Release"/>
-      <Project Name="ZoomNavigator" ConfigName="Win_x86_Release"/>
-      <Project Name="abbreviation" ConfigName="Win_x86_Release"/>
-      <Project Name="codelite_vim" ConfigName="Win_x86_Release"/>
-      <Project Name="databaselayer_sqlite" ConfigName="Win_x86_Release"/>
-      <Project Name="git" ConfigName="Win_x86_Release"/>
-      <Project Name="hunspell" ConfigName="Release"/>
-      <Project Name="libCodeLite" ConfigName="Win_x86_Release"/>
-      <Project Name="plugin_sdk" ConfigName="Win_x86_Release"/>
-      <Project Name="snipwiz" ConfigName="Win_x86_Release"/>
-      <Project Name="sqlite3" ConfigName="Common"/>
       <Project Name="wxFormBuilder" ConfigName="Win_x86_Release"/>
       <Project Name="wxshapeframework" ConfigName="Win_x86_Release"/>
       <Project Name="wxsqlite3" ConfigName="Win_x86_Release"/>
+      <Project Name="ZoomNavigator" ConfigName="Win_x86_Release"/>
+      <Project Name="CxxParserTests" ConfigName="Debug"/>
+      <Project Name="CCTest" ConfigName="Debug"/>
+      <Project Name="SampleWorksapce" ConfigName="Debug"/>
+      <Project Name="SmartCompletion" ConfigName="Win_x64_Debug"/>
     </WorkspaceConfiguration>
     <WorkspaceConfiguration Name="CMake_Release" Selected="no">
       <Environment/>

diff --git a/LiteEditor/editorsettingsterminal.cpp b/LiteEditor/editorsettingsterminal.cpp
@@ -23,8 +23,8 @@
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
 
-#include "editorsettingsterminal.h"
 #include "editor_config.h"
+#include "editorsettingsterminal.h"
 
 EditorSettingsTerminal::EditorSettingsTerminal(wxWindow* parent)
     : EditorSettingsTerminalBase(parent)
@@ -43,11 +43,7 @@ void EditorSettingsTerminal::Save(OptionsConfigPtr options)
 
 void EditorSettingsTerminal::OnUseCodeLiteTerminalUI(wxUpdateUIEvent& event)
 {
-#if defined(__WXMSW__) || defined(__WXOSX__)
-    event.Enable(false);
-#else
-    event.Enable(!m_checkBoxUseCodeLiteTerminal->IsChecked());
-#endif
+    event.Check(m_checkBoxUseCodeLiteTerminal->IsChecked());
 }
 
 void EditorSettingsTerminal::OnCheckboxmswwrapdoublequotesUpdateUi(wxUpdateUIEvent& event)