suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PySide stuff

Browse Source
This commit is contained in:
wmayer 2013-06-30 11:01:09 +02:00
parent 215775b7f2
commit 873730effe
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Gui/WidgetFactory.cpp
View File

@ -23,7 +23,10 @@
#include "PreCompiled.h"
#if 0 // disable for now
// Remove this block when activating PySide support!
#undef HAVE_SHIBOKEN
#undef HAVE_PYSIDE
#ifdef HAVE_SHIBOKEN
# undef _POSIX_C_SOURCE
# undef _XOPEN_SOURCE
@ -35,7 +38,6 @@
PyTypeObject** SbkPySide_QtCoreTypes=NULL;
# endif
#endif
#endif
#include <CXX/Objects.hxx>
#include <App/Application.h>
@ -57,9 +59,8 @@ PythonWrapper::PythonWrapper()
QObject* PythonWrapper::toQObject(const Py::Object& pyobject)
{
#if 0
// http://pastebin.com/JByDAF5Z
//#if defined (HAVE_SHIBOKEN) && defined(HAVE_PYSIDE)
#if defined (HAVE_SHIBOKEN) && defined(HAVE_PYSIDE)
PyTypeObject * type = Shiboken::SbkType<QObject>();
if (type) {
if (Shiboken::Object::checkType(pyobject.ptr())) {
@ -95,8 +96,7 @@ Py::Object PythonWrapper::toPython(QWidget* widget)
bool PythonWrapper::loadModule()
{
#if 0
//#if defined (HAVE_SHIBOKEN) && defined(HAVE_PYSIDE)
#if defined (HAVE_SHIBOKEN) && defined(HAVE_PYSIDE)
if (SbkPySide_QtCoreTypes)
return true; // already loaded
Shiboken::AutoDecRef requiredModule(Shiboken::Module::import("PySide.QtCore"));