159 lines
6.3 KiB
Diff
159 lines
6.3 KiB
Diff
|
diff -ru codelite-17.6.0/CodeLite/MSYS2.cpp codelite-17.6.0.patched/CodeLite/MSYS2.cpp
|
||
|
|
--- codelite-17.6.0/CodeLite/MSYS2.cpp 2023-08-31 20:09:33.000000000 +0200
|
||
|
|
+++ codelite-17.6.0.patched/CodeLite/MSYS2.cpp 2023-09-01 16:05:31.191903677 +0200
|
||
|
|
@@ -6,11 +6,15 @@
|
||
|
|
#include <wx/arrstr.h>
|
||
|
|
#include <wx/stdpaths.h>
|
||
|
|
#include <wx/tokenzr.h>
|
||
|
|
+#include <wx/filename.h>
|
||
|
|
+#include <wx/utils.h>
|
||
|
|
|
||
|
|
#ifdef __WXMSW__
|
||
|
|
#include <wx/msw/registry.h>
|
||
|
|
#endif
|
||
|
|
|
||
|
|
+//using namespace std;
|
||
|
|
+
|
||
|
|
bool MSYS2::FindInstallDir(wxString* msyspath)
|
||
|
|
{
|
||
|
|
if(m_checked_for_install_dir) {
|
||
|
|
@@ -183,3 +187,4 @@
|
||
|
|
*value = ::wxJoin(paths_to_try, ';');
|
||
|
|
return true;
|
||
|
|
}
|
||
|
|
+
|
||
|
|
diff -ru codelite-17.6.0/CodeLite/MSYS2.hpp codelite-17.6.0.patched/CodeLite/MSYS2.hpp
|
||
|
|
--- codelite-17.6.0/CodeLite/MSYS2.hpp 2023-08-31 20:09:33.000000000 +0200
|
||
|
|
+++ codelite-17.6.0.patched/CodeLite/MSYS2.hpp 2023-09-01 16:04:55.549773010 +0200
|
||
|
|
@@ -3,6 +3,8 @@
|
||
|
|
|
||
|
|
#include "PlatformCommon.hpp"
|
||
|
|
#include "codelite_exports.h"
|
||
|
|
+#include <wx/arrstr.h>
|
||
|
|
+//#include <wx/filename.h>
|
||
|
|
|
||
|
|
class WXDLLIMPEXP_CL MSYS2 : public PlatformCommon
|
||
|
|
{
|
||
|
|
diff -ru codelite-17.6.0/CodeLite/istorage.h codelite-17.6.0.patched/CodeLite/istorage.h
|
||
|
|
--- codelite-17.6.0/CodeLite/istorage.h 2023-08-31 20:09:33.000000000 +0200
|
||
|
|
+++ codelite-17.6.0.patched/CodeLite/istorage.h 2023-09-01 16:17:34.974367687 +0200
|
||
|
|
@@ -31,6 +31,7 @@
|
||
|
|
#include "fileentry.h"
|
||
|
|
#include "pptable.h"
|
||
|
|
#include "tag_tree.h"
|
||
|
|
+#include <wx/filename.h>
|
||
|
|
|
||
|
|
#define MAX_SEARCH_LIMIT 250
|
||
|
|
|
||
|
|
diff -ru codelite-17.6.0/LiteEditor/ContextRust.cpp codelite-17.6.0.patched/LiteEditor/ContextRust.cpp
|
||
|
|
--- codelite-17.6.0/LiteEditor/ContextRust.cpp 2023-08-31 20:09:33.000000000 +0200
|
||
|
|
+++ codelite-17.6.0.patched/LiteEditor/ContextRust.cpp 2023-09-01 19:41:34.386045403 +0200
|
||
|
|
@@ -33,6 +33,7 @@
|
||
|
|
#include "editor_config.h"
|
||
|
|
|
||
|
|
#include <unordered_set>
|
||
|
|
+#include <wx/xrc/xmlres.h>
|
||
|
|
|
||
|
|
ContextRust::ContextRust(clEditor* editor)
|
||
|
|
: ContextGeneric(editor, "rust")
|
||
|
|
diff -ru codelite-17.6.0/LiteEditor/clConfigurationSelectionCtrl.h codelite-17.6.0.patched/LiteEditor/clConfigurationSelectionCtrl.h
|
||
|
|
--- codelite-17.6.0/LiteEditor/clConfigurationSelectionCtrl.h 2023-08-31 20:09:33.000000000 +0200
|
||
|
|
+++ codelite-17.6.0.patched/LiteEditor/clConfigurationSelectionCtrl.h 2023-09-01 19:50:31.153164609 +0200
|
||
|
|
@@ -6,6 +6,7 @@
|
||
|
|
|
||
|
|
#include <wx/arrstr.h>
|
||
|
|
#include <wx/panel.h>
|
||
|
|
+#include <wx/choice.h>
|
||
|
|
|
||
|
|
#define OPEN_CONFIG_MGR_STR _("Open Workspace Configuration Manager...")
|
||
|
|
|
||
|
|
diff -ru codelite-17.6.0/LiteEditor/tabgroupmanager.h codelite-17.6.0.patched/LiteEditor/tabgroupmanager.h
|
||
|
|
--- codelite-17.6.0/LiteEditor/tabgroupmanager.h 2023-08-31 20:09:33.000000000 +0200
|
||
|
|
+++ codelite-17.6.0.patched/LiteEditor/tabgroupmanager.h 2023-09-01 20:14:29.012198636 +0200
|
||
|
|
@@ -33,6 +33,7 @@
|
||
|
|
#include <wx/arrstr.h>
|
||
|
|
#include <wx/event.h>
|
||
|
|
#include <wx/string.h>
|
||
|
|
+#include <wx/xml/xml.h>
|
||
|
|
|
||
|
|
/**
|
||
|
|
* Each pair consists of the tabgroup name, and an array of the names of the constituent tabs
|
||
|
|
diff -ru codelite-17.6.0/Plugin/DiffUI.h codelite-17.6.0.patched/Plugin/DiffUI.h
|
||
|
|
--- codelite-17.6.0/Plugin/DiffUI.h 2023-08-31 20:09:33.000000000 +0200
|
||
|
|
+++ codelite-17.6.0.patched/Plugin/DiffUI.h 2023-09-01 16:27:07.076455148 +0200
|
||
|
|
@@ -29,6 +29,7 @@
|
||
|
|
#include <wx/persist/toplevel.h>
|
||
|
|
#include <wx/persist/treebook.h>
|
||
|
|
#endif
|
||
|
|
+#include <wx/frame.h>
|
||
|
|
|
||
|
|
#ifdef WXC_FROM_DIP
|
||
|
|
#undef WXC_FROM_DIP
|
||
|
|
diff -ru codelite-17.6.0/Plugin/clEditorEditEventsHandler.cpp codelite-17.6.0.patched/Plugin/clEditorEditEventsHandler.cpp
|
||
|
|
--- codelite-17.6.0/Plugin/clEditorEditEventsHandler.cpp 2023-08-31 20:09:33.000000000 +0200
|
||
|
|
+++ codelite-17.6.0.patched/Plugin/clEditorEditEventsHandler.cpp 2023-09-01 16:41:58.642092030 +0200
|
||
|
|
@@ -6,6 +6,7 @@
|
||
|
|
#include <wx/stc/stc.h>
|
||
|
|
#include <wx/textctrl.h>
|
||
|
|
#include <wx/textentry.h>
|
||
|
|
+#include <wx/app.h>
|
||
|
|
|
||
|
|
clEditEventsHandler::clEditEventsHandler(wxStyledTextCtrl* wnd, const wxString& name)
|
||
|
|
: m_stc(wnd)
|
||
|
|
diff -ru codelite-17.6.0/Plugin/clFileSystemWorkspaceView.hpp codelite-17.6.0.patched/Plugin/clFileSystemWorkspaceView.hpp
|
||
|
|
--- codelite-17.6.0/Plugin/clFileSystemWorkspaceView.hpp 2023-08-31 20:09:33.000000000 +0200
|
||
|
|
+++ codelite-17.6.0.patched/Plugin/clFileSystemWorkspaceView.hpp 2023-09-01 16:44:29.832448701 +0200
|
||
|
|
@@ -6,6 +6,7 @@
|
||
|
|
#include "clTreeCtrlPanel.h"
|
||
|
|
#include "cl_command_event.h"
|
||
|
|
#include "cl_config.h"
|
||
|
|
+#include <wx/choice.h>
|
||
|
|
|
||
|
|
class clThemedButton;
|
||
|
|
class WXDLLIMPEXP_SDK clFileSystemWorkspaceView : public clTreeCtrlPanel
|
||
|
|
diff -ru codelite-17.6.0/Plugin/clPluginsFindBar.h codelite-17.6.0.patched/Plugin/clPluginsFindBar.h
|
||
|
|
--- codelite-17.6.0/Plugin/clPluginsFindBar.h 2023-08-31 20:09:33.000000000 +0200
|
||
|
|
+++ codelite-17.6.0.patched/Plugin/clPluginsFindBar.h 2023-09-01 16:28:53.779576592 +0200
|
||
|
|
@@ -33,6 +33,7 @@
|
||
|
|
#include <codelite_exports.h>
|
||
|
|
#include <wx/combobox.h>
|
||
|
|
#include <wx/panel.h>
|
||
|
|
+#include <wx/stattext.h>
|
||
|
|
|
||
|
|
class wxStyledTextCtrl;
|
||
|
|
|
||
|
|
diff -ru codelite-17.6.0/Plugin/wxTerminalCtrl/wxTerminalEvent.hpp codelite-17.6.0.patched/Plugin/wxTerminalCtrl/wxTerminalEvent.hpp
|
||
|
|
--- codelite-17.6.0/Plugin/wxTerminalCtrl/wxTerminalEvent.hpp 2023-08-31 20:09:33.000000000 +0200
|
||
|
|
+++ codelite-17.6.0.patched/Plugin/wxTerminalCtrl/wxTerminalEvent.hpp 2023-09-01 17:16:16.773605826 +0200
|
||
|
|
@@ -6,6 +6,7 @@
|
||
|
|
#include <wx/arrstr.h>
|
||
|
|
#include <wx/ffile.h>
|
||
|
|
#include <wx/utils.h>
|
||
|
|
+#include <wx/event.h>
|
||
|
|
|
||
|
|
/// a wxCommandEvent that takes ownership of the clientData
|
||
|
|
class WXDLLIMPEXP_SDK wxTerminalEvent : public wxCommandEvent
|
||
|
|
diff -ru codelite-17.6.0/Plugin/wxTerminalCtrl/wxTerminalInputCtrl.cpp codelite-17.6.0.patched/Plugin/wxTerminalCtrl/wxTerminalInputCtrl.cpp
|
||
|
|
--- codelite-17.6.0/Plugin/wxTerminalCtrl/wxTerminalInputCtrl.cpp 2023-08-31 20:09:33.000000000 +0200
|
||
|
|
+++ codelite-17.6.0.patched/Plugin/wxTerminalCtrl/wxTerminalInputCtrl.cpp 2023-09-01 17:18:48.056591588 +0200
|
||
|
|
@@ -14,6 +14,7 @@
|
||
|
|
#include <wx/dcmemory.h>
|
||
|
|
#include <wx/tokenzr.h>
|
||
|
|
#include <wx/uiaction.h>
|
||
|
|
+#include <wx/menu.h>
|
||
|
|
|
||
|
|
#define CAN_GO_BACK() (true)
|
||
|
|
#define CAN_DELETE() (true)
|
||
|
|
diff -ru codelite-17.6.0/Remoty/sample_codelite_remote_json.cpp codelite-17.6.0.patched/Remoty/sample_codelite_remote_json.cpp
|
||
|
|
--- codelite-17.6.0/Remoty/sample_codelite_remote_json.cpp 2023-08-31 20:09:33.000000000 +0200
|
||
|
|
+++ codelite-17.6.0.patched/Remoty/sample_codelite_remote_json.cpp 2023-09-01 19:11:03.703637315 +0200
|
||
|
|
@@ -1,6 +1,8 @@
|
||
|
|
#ifndef SAMPLE_CODELITE_REMOTE_JSON_HPP
|
||
|
|
#define SAMPLE_CODELITE_REMOTE_JSON_HPP
|
||
|
|
|
||
|
|
+#include <wx/string.h>
|
||
|
|
+
|
||
|
|
const wxString DEFAULT_CODELITE_REMOTE_JSON = R"EOF(
|
||
|
|
{
|
||
|
|
"Language Server Plugin": {
|