Update of /cvsroot/pywin32/pywin32/Pythonwin
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv13026/Pythonwin
Modified Files:
win32dlg.cpp
Log Message:
consolidation of more py3k-friendly changes from py3k branch
Index: win32dlg.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/win32dlg.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** win32dlg.cpp 13 Nov 2008 04:04:50 -0000 1.11
--- win32dlg.cpp 4 Dec 2008 00:17:13 -0000 1.12
***************
*** 87,97 ****
if (hGlob==NULL)
RETURN_API_ERR("LoadResource");
-
- CDialog *pDlg = new CPythonDlg();
- PyCDialog *ret = (PyCDialog *)ui_assoc_object::make( PyCDialog::type, pDlg, TRUE);
- if (ret) {
- ret->hTemplate = hGlob;
- ret->hInstance = hMod;
- }
return MakeDlgListFromResource(hGlob);
}
--- 87,90 ----
***************
*** 510,514 ****
{
PyObject *obList = NULL;
! // @pyparm list|obList||A list of [<o Dialog Header Tuple>, <o Dialog Item Tuple>, ...], which describe the dialog to be created.
if (!PyArg_ParseTuple(args, "O:CreateDialogIndirect", &obList))
return NULL;
--- 503,507 ----
{
PyObject *obList = NULL;
! // @pyparm list|obList||A list of [<o PyDLGTEMPLATE>, <o PyDLGITEMTEMPLATE>, ...], which describe the dialog to be created.
if (!PyArg_ParseTuple(args, "O:CreateDialogIndirect", &obList))
return NULL;
|
