-
Notifications
You must be signed in to change notification settings - Fork 89
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Showing
3 changed files
with
56 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
From c5c975afa30c958b87399255abf13e653138a697 Mon Sep 17 00:00:00 2001 | ||
From: Eran Ifrah <[email protected]> | ||
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; | ||
diff --git a/codelitephp/php-plugin/php_open_resource_dlg.h b/codelitephp/php-plugin/php_open_resource_dlg.h | ||
index fb91ee0c80..2379737455 100644 | ||
--- a/codelitephp/php-plugin/php_open_resource_dlg.h | ||
+++ b/codelitephp/php-plugin/php_open_resource_dlg.h | ||
@@ -26,13 +26,13 @@ | ||
#ifndef __php_open_resource_dlg__ | ||
#define __php_open_resource_dlg__ | ||
|
||
-#include <wx/propgrid/manager.h> | ||
#include "php_ui.h" | ||
#include <vector> | ||
#include "PHPEntityVariable.h" | ||
#include "PHPEntityBase.h" | ||
#include "PHPLookupTable.h" | ||
#include "bitmap_loader.h" | ||
+#include <wx/propgrid/manager.h> | ||
|
||
struct ResourceItem { | ||
enum { kRI_Invalid = -1, kRI_File, kRI_Class, kRI_Constant, kRI_Function, kRI_Member, kRI_Variable, kRI_Namespace }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters