Update wxWidgets, fix Linux compile

Author: Ravbug

.github/workflows/build.yml

@@ -25,7 +25,7 @@ jobs:
 
   build-mac:
     name: Build App for macOS
-    runs-on: macos-latest
+    runs-on: macos-11
     steps:
       - name: Checkout code
         uses: actions/checkout@v2

source/create_dialog_derived.cpp

@@ -90,7 +90,7 @@ void CreateProjectDialogD::OnCreate(wxCommandEvent& event){
 			auto fullTemplate = std::filesystem::path("\"") / executableTemplatesPath / (templatePrefix + "." + templateName + "\"");
 			string command = "\"" + executablePath.string() + "\" -createproject " + fullProj.string() + " -cloneFromTemplate \"" + fullTemplate.string();
 		#elif defined __linux__
-			string command = "\"" + executablePath + "\" -createproject \"" + projPath + dirsep + projName + "\" -cloneFromTemplate \"" + executableTemplatesPath + templatePrefix + "." + templateName + "\"";
+			string command = "\"" + executablePath.string() + "\" -createproject \"" + (filesystem::path(projPath) / projName).string() + "\" -cloneFromTemplate \"" + executableTemplatesPath.string() + templatePrefix + "." + templateName + "\"";
 		#endif
 		//TODO: return this command to what summoned this dialog
 		project p = {projName,e.name,"",filesystem::path(projPath) / filesystem::path(projName)};

source/globals.h

@@ -122,7 +122,7 @@ struct editor{
 	static const std::string null_device = ">/dev/null 2>&1";
 	static const char dirsep = '/';
 
-	static const std::filesyste::path executable = "Editor/Unity";
+	static const std::filesystem::path executable = "Editor/Unity";
     static const std::vector<std::filesystem::path> defaultInstall = {std::filesystem::path(getpwuid(getuid())->pw_dir) / "Unity/Hub/Editor"};
 	//TODO: make this a preference?
 	static const std::filesystem::path hubDefault = "";

source/interface_derived.hpp

@@ -167,7 +167,7 @@ class MainFrameDerived : public MainFrame{
  Defines the functionality for the project creation dialog
  */
 typedef std::function<void(const std::string&,const project&)> DialogCallback;
-class CreateProjectDialogD : CreateProjectDialog{
+class CreateProjectDialogD : public CreateProjectDialog{
 public:
 	CreateProjectDialogD(wxWindow* parent, const std::vector<editor>& versions, const DialogCallback& callback);
 	void show(){
@@ -192,7 +192,7 @@ class CreateProjectDialogD : CreateProjectDialog{
 };
 
 typedef std::function<void(const project&, const editor&)> OpenWithCallback;
-class OpenWithDlg : OpenWithEditorDlgBase{
+class OpenWithDlg : public OpenWithEditorDlgBase{
 public:
 	OpenWithDlg(wxWindow* parent, const project& project, const std::vector<editor>& versions,  const OpenWithCallback& callback);
 	void show(){
@@ -219,7 +219,7 @@ class OpenWithDlg : OpenWithEditorDlgBase{
 	wxDECLARE_EVENT_TABLE();
 };
 
-class AddNewInstallDlg : AddNewInstallDlgBase{
+class AddNewInstallDlg : public AddNewInstallDlgBase{
 public:
     AddNewInstallDlg(wxWindow* parent);
 

wxWidgets/CMakeLists.txt

@@ -26,10 +26,16 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
     set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release")
 endif()
 
+# This block, particularly the versions used, should be kept in sync with
+# samples/minimal/CMakeLists.txt.
 if(APPLE AND NOT CMAKE_OSX_DEPLOYMENT_TARGET)
     # If no deployment target has been set default to the minimum supported
-    # OS X version (this has to be set before the first project() call)
-    set(CMAKE_OSX_DEPLOYMENT_TARGET 10.10 CACHE STRING "macOS Deployment Target")
+    # OS version (this has to be set before the first project() call)
+    if(CMAKE_SYSTEM_NAME STREQUAL "iOS")
+        set(CMAKE_OSX_DEPLOYMENT_TARGET 12.0 CACHE STRING "iOS Deployment Target")
+    else()
+        set(CMAKE_OSX_DEPLOYMENT_TARGET 10.10 CACHE STRING "macOS Deployment Target")
+    endif()
 endif()
 
 include(build/cmake/policies.cmake NO_POLICY_SCOPE)
@@ -62,7 +68,7 @@ else()
 endif()
 
 set(wxVERSION ${wxMAJOR_VERSION}.${wxMINOR_VERSION}.${wxRELEASE_NUMBER})
-set(wxCOPYRIGHT "1992-2020 wxWidgets")
+set(wxCOPYRIGHT "1992-2021 wxWidgets")
 
 project(wxWidgets VERSION ${wxVERSION})