Qt4/Qt5 neutral changes:

+ replace Q_WS_WIN with Q_OS_WIN
+ replace Q_WS_X11 with Q_OS_LINUX
+ replace Q_WS_MACX with Q_OS_MACX
+ set explicit cast to HWND
This commit is contained in:
wmayer
2016-12-12 14:09:21 +01:00
parent 546656867b
commit 1cdee20953
10 changed files with 27 additions and 27 deletions

View File

@@ -198,14 +198,14 @@ FreeCADGui_embedToWindow(PyObject * /*self*/, PyObject *args)
#if defined(Q_OS_WIN)
void* window = 0;
str >> window;
WId winid = (WId)window;
HWND winid = (HWND)window;
LONG oldLong = GetWindowLong(winid, GWL_STYLE);
SetWindowLong(winid, GWL_STYLE,
oldLong | WS_CLIPCHILDREN | WS_CLIPSIBLINGS);
//SetWindowLong(widget->winId(), GWL_STYLE,
// WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS);
SetParent(widget->winId(), winid);
SetParent((HWND)widget->winId(), winid);
QEvent embeddingEvent(QEvent::EmbeddingControl);
QApplication::sendEvent(widget, &embeddingEvent);