33 lines
1.8 KiB
Diff
33 lines
1.8 KiB
Diff
|
From c5c975afa30c958b87399255abf13e653138a697 Mon Sep 17 00:00:00 2001
|
||
|
From: Eran Ifrah <eran@codelite.org>
|
||
|
Date: Tue, 21 Mar 2023 01:37:47 +0200
|
||
|
Subject: [PATCH] fixed build against latest wx-master
|
||
|
|
||
|
---
|
||
|
LiteEditor/editorsettingsdockingwidows.cpp | 4 ++--
|
||
|
codelitephp/php-plugin/php_open_resource_dlg.h | 2 +-
|
||
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
||
|
diff --git a/LiteEditor/editorsettingsdockingwidows.cpp b/LiteEditor/editorsettingsdockingwidows.cpp
|
||
|
index d14341863e..973f194a39 100644
|
||
|
--- a/LiteEditor/editorsettingsdockingwidows.cpp
|
||
|
+++ b/LiteEditor/editorsettingsdockingwidows.cpp
|
||
|
@@ -59,7 +59,7 @@ EditorSettingsDockingWindows::EditorSettingsDockingWindows(wxWindow* parent, Opt
|
||
|
std::unordered_map<wxString, wxDirection> orientation_map = { { "UP", wxUP }, { "DOWN", wxDOWN } };
|
||
|
std::unordered_map<int, wxString> orientation_map_reverse = { { wxUP, "UP" }, { wxDOWN, "DOWN" } };
|
||
|
|
||
|
- AddProperty(_("Workspace tabs orientation"), { "UP", "DOWN" },
|
||
|
+ AddProperty(_("Workspace tabs orientation"), std::vector<wxString>{ "UP", "DOWN" },
|
||
|
orientation_map_reverse[m_options->GetWorkspaceTabsDirection()],
|
||
|
[this, orientation_map](const wxString&, const wxAny& value) mutable {
|
||
|
wxString str_value;
|
||
|
@@ -67,7 +67,7 @@ EditorSettingsDockingWindows::EditorSettingsDockingWindows(wxWindow* parent, Opt
|
||
|
m_options->SetWorkspaceTabsDirection(orientation_map[str_value]);
|
||
|
}
|
||
|
});
|
||
|
- AddProperty(_("Output tabs orientation"), { "UP", "DOWN" },
|
||
|
+ AddProperty(_("Output tabs orientation"), std::vector<wxString>{ "UP", "DOWN" },
|
||
|
orientation_map_reverse[m_options->GetOutputTabsDirection()],
|
||
|
[this, orientation_map](const wxString&, const wxAny& value) mutable {
|
||
|
wxString str_value;
|