kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Tools: port example of embedding to Py3

Browse Source
This commit is contained in:
wmayer
2021-09-19 18:01:24 +02:00
parent 2fd71242ba
commit c1cbee9a06
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/Tools/embedded/Win32/FreeCAD_widget/FreeCAD_widget.cpp
View File

@@ -236,11 +236,11 @@ std::string OnFileOpen(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
void OnLoadFreeCAD(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{
if (!Py_IsInitialized()) {
Py_SetProgramName("CEmbed_FreeCADDlg");
Py_SetProgramName(L"CEmbed_FreeCADDlg");
Py_Initialize();
static int argc = 1;
static char* app = "CEmbed_FreeCADDlg";
static char *argv[2] = {app,0};
static wchar_t* app = L"CEmbed_FreeCADDlg";
static wchar_t *argv[2] = {app,0};
PySys_SetArgv(argc, argv);
}
@@ -268,12 +268,12 @@ void OnLoadFreeCAD(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
EnableMenuItem(hMenu, ID_FREECAD_EMBEDWINDOW, MF_ENABLED);
}
else {
PyObject *ptype, *pvalue, *ptrace;
PyErr_Fetch(&ptype, &pvalue, &ptrace);
PyObject* pystring = PyObject_Str(pvalue);
const char* error = PyString_AsString(pystring);
MessageBox(0, error, "Error", MB_OK);
Py_DECREF(pystring);
PyObject *ptype, *pvalue, *ptrace;
PyErr_Fetch(&ptype, &pvalue, &ptrace);
PyObject* pystring = PyObject_Str(pvalue);
const char* error = PyUnicode_AsUTF8(pystring);
MessageBox(0, error, "Error", MB_OK);
Py_DECREF(pystring);
}
Py_DECREF(dict);
}
@@ -291,12 +291,12 @@ void OnNewDocument(HWND hWnd)
Py_DECREF(result);
}
else {
PyObject *ptype, *pvalue, *ptrace;
PyErr_Fetch(&ptype, &pvalue, &ptrace);
PyObject* pystring = PyObject_Str(pvalue);
const char* error = PyString_AsString(pystring);
MessageBox(hWnd, error, "Error", MB_OK);
Py_DECREF(pystring);
PyObject *ptype, *pvalue, *ptrace;
PyErr_Fetch(&ptype, &pvalue, &ptrace);
PyObject* pystring = PyObject_Str(pvalue);
const char* error = PyUnicode_AsUTF8(pystring);
MessageBox(hWnd, error, "Error", MB_OK);
Py_DECREF(pystring);
}
Py_DECREF(dict);
}
@@ -326,12 +326,12 @@ void OnEmbedWidget(HWND hWnd)
EnableMenuItem(hMenu, ID_FREECAD_EMBEDWINDOW, MF_DISABLED);
}
else {
PyObject *ptype, *pvalue, *ptrace;
PyErr_Fetch(&ptype, &pvalue, &ptrace);
PyObject* pystring = PyObject_Str(pvalue);
const char* error = PyString_AsString(pystring);
MessageBox(hWnd, error, "Error", MB_OK);
Py_DECREF(pystring);
PyObject *ptype, *pvalue, *ptrace;
PyErr_Fetch(&ptype, &pvalue, &ptrace);
PyObject* pystring = PyObject_Str(pvalue);
const char* error = PyUnicode_AsUTF8(pystring);
MessageBox(hWnd, error, "Error", MB_OK);
Py_DECREF(pystring);
}
Py_DECREF(dict);
}