added SWindow.set_as_owner(wid)

Roberto De Ioris · Roberto De Ioris · commit 134cc8a522ae · 2018-07-03T11:10:46.000+02:00
diff --git a/Source/UnrealEnginePython/Private/Slate/UEPySWindow.cpp b/Source/UnrealEnginePython/Private/Slate/UEPySWindow.cpp
@@ -5,6 +5,10 @@
 #include "Editor/MainFrame/Public/Interfaces/IMainFrameModule.h"
 #endif
 
+#if PLATFORM_WINDOWS
+#include "Windows/AllowWindowsPlatformTypes.h"
+#endif
+
 
 
 static PyObject *py_ue_swindow_set_title(ue_PySWindow *self, PyObject * args)
@@ -90,6 +94,21 @@ static PyObject *py_ue_swindow_get_handle(ue_PySWindow *self, PyObject * args)
 	return PyLong_FromLongLong((long long)py_SWindow->GetNativeWindow()->GetOSWindowHandle());
 }
 
+static PyObject *py_ue_swindow_set_as_owner(ue_PySWindow *self, PyObject * args)
+{
+	ue_py_slate_cast(SWindow);
+	long long window_ptr;
+	if (!PyArg_ParseTuple(args, "L:set_as_owner", &window_ptr))
+	{
+		return nullptr;
+	}
+	void *whnd = py_SWindow->GetNativeWindow()->GetOSWindowHandle();
+#if PLATFORM_WINDOWS
+	SetWindowLongPtr((HWND)window_ptr, GWLP_HWNDPARENT, (LONG_PTR)whnd);
+#endif
+	Py_RETURN_NONE;
+}
+
 static PyObject *py_ue_swindow_request_destroy(ue_PySWindow *self, PyObject * args)
 {
 	ue_py_slate_cast(SWindow);
@@ -144,6 +163,7 @@ static PyMethodDef ue_PySWindow_methods[] = {
 	{ "set_client_size", (PyCFunction)py_ue_swindow_resize, METH_VARARGS, "" },
 	{ "set_content", (PyCFunction)py_ue_swindow_set_content, METH_VARARGS, "" },
 	{ "get_handle", (PyCFunction)py_ue_swindow_get_handle, METH_VARARGS, "" },
+	{ "set_as_owner", (PyCFunction)py_ue_swindow_set_as_owner, METH_VARARGS, "" },
 	{ "request_destroy", (PyCFunction)py_ue_swindow_request_destroy, METH_VARARGS, "" },
 #if WITH_EDITOR
 	{ "add_modal", (PyCFunction)py_ue_swindow_add_modal, METH_VARARGS, "" },
diff --git a/Source/UnrealEnginePython/Private/UnrealEnginePython.cpp b/Source/UnrealEnginePython/Private/UnrealEnginePython.cpp
@@ -23,7 +23,7 @@
 void unreal_engine_init_py_module();
 void init_unreal_engine_builtin();
 
-#if defined(UNREAL_ENGINE_PYTHON_ON_LINUX)
+#if PLATFORM_LINUX
 const char *ue4_module_options = "linux_global_symbols";
 #endif
 
diff --git a/Source/UnrealEnginePython/Public/UnrealEnginePython.h b/Source/UnrealEnginePython/Public/UnrealEnginePython.h
@@ -9,13 +9,22 @@
 
 //#define UEPY_MEMORY_DEBUG	1
 
-#if defined(UNREAL_ENGINE_PYTHON_ON_MAC)
+
+
+
+#include "CoreMinimal.h"
+#include "ModuleManager.h"
+#include "Styling/SlateStyle.h"
+#include "UObject/ScriptMacros.h"
+#include "Runtime/Launch/Resources/Version.h"
+
+#if PLATFORM_MAC
 #include <Headers/Python.h>
 #include <Headers/structmember.h>
-#elif defined(UNREAL_ENGINE_PYTHON_ON_LINUX)
+#elif PLATFORM_LINUX
 #include <Python.h>
 #include <structmember.h>
-#else
+#elif PLATFORM_WINDOWS
 #include <include/pyconfig.h>
 #ifndef SIZEOF_PID_T
 #define SIZEOF_PID_T 4
@@ -24,13 +33,6 @@
 #include <include/structmember.h>
 #endif
 
-
-#include "CoreMinimal.h"
-#include "ModuleManager.h"
-#include "Styling/SlateStyle.h"
-#include "UObject/ScriptMacros.h"
-#include "Runtime/Launch/Resources/Version.h"
-
 typedef struct
 {
 	PyObject_HEAD
diff --git a/Source/UnrealEnginePython/UnrealEnginePython.Build.cs b/Source/UnrealEnginePython/UnrealEnginePython.Build.cs
@@ -232,7 +232,6 @@ public UnrealEnginePython(TargetInfo Target)
             string libPath = GetMacPythonLibFile(pythonHome);
             PublicLibraryPaths.Add(Path.GetDirectoryName(libPath));
             PublicDelayLoadDLLs.Add(libPath);
-            Definitions.Add(string.Format("UNREAL_ENGINE_PYTHON_ON_MAC"));
         }
         else if (Target.Platform == UnrealTargetPlatform.Linux)
         {
@@ -257,7 +256,6 @@ public UnrealEnginePython(TargetInfo Target)
                 PublicIncludePaths.Add(items[0]);
                 PublicAdditionalLibraries.Add(items[1]);
             }
-            Definitions.Add(string.Format("UNREAL_ENGINE_PYTHON_ON_LINUX"));
         }
 
     }

Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,6 @@ public UnrealEnginePython(TargetInfo Target)`
`232`	`232`	`string libPath = GetMacPythonLibFile(pythonHome);`
`233`	`233`	`PublicLibraryPaths.Add(Path.GetDirectoryName(libPath));`
`234`	`234`	`PublicDelayLoadDLLs.Add(libPath);`
`235`		`- Definitions.Add(string.Format("UNREAL_ENGINE_PYTHON_ON_MAC"));`
`236`	`235`	`}`
`237`	`236`	`else if (Target.Platform == UnrealTargetPlatform.Linux)`
`238`	`237`	`{`
`@@ -257,7 +256,6 @@ public UnrealEnginePython(TargetInfo Target)`
`257`	`256`	`PublicIncludePaths.Add(items[0]);`
`258`	`257`	`PublicAdditionalLibraries.Add(items[1]);`
`259`	`258`	`}`
`260`		`- Definitions.Add(string.Format("UNREAL_ENGINE_PYTHON_ON_LINUX"));`
`261`	`259`	`}`
`262`	`260`
`263`	`261`	`}`