fixed build against latest wx-master

eranif · Mar 20, 2023 · c5c975a · c5c975a
1 parent 6f41d79
commit c5c975a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/LiteEditor/editorsettingsdockingwidows.cpp b/LiteEditor/editorsettingsdockingwidows.cpp
@@ -59,15 +59,15 @@ 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;
                     if(value.GetAs(&str_value)) {
                         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
@@ -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 };