pywin32-checkins

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32/Pythonwin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20434

Modified Files:
	win32cmdui.cpp 
Log Message:
[ 1043735 ] Added m_pMenu and m_pSubMenu attributes to PyCCmdUI


Index: win32cmdui.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/win32cmdui.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** win32cmdui.cpp	4 Aug 2000 04:44:45 -0000	1.5
--- win32cmdui.cpp	10 Jan 2006 04:52:19 -0000	1.6
***************
*** 14,17 ****
--- 14,18 ----
  */
  #include "stdafx.h"
+ #include "win32menu.h"
  #include "win32cmdui.h"
  
***************
*** 270,273 ****
--- 271,290 ----
  			return NULL;
  		return PyInt_FromLong(pCU->m_nID);
+ 	} else if (strcmp(name, "m_pMenu")==0) { // @prop <o PyCMenu>|m_pMenu|
+ 		CCmdUI *pCU = PyCCmdUI::GetCCmdUIPtr(this);
+ 		if (!pCU)
+ 			return NULL;
+ 		if (pCU->m_pMenu)
+ 			return ui_assoc_object::make(PyCMenu::type, pCU->m_pMenu->GetSafeHmenu());
+ 		Py_INCREF(Py_None);
+ 		return Py_None;
+ 	} else if (strcmp(name, "m_pSubMenu")==0) { // @prop <o PyCMenu>|m_pSubMenu|
+ 		CCmdUI *pCU = PyCCmdUI::GetCCmdUIPtr(this);
+ 		if (!pCU)
+ 			return NULL;
+ 		if (pCU->m_pSubMenu)
+ 			return ui_assoc_object::make(PyCMenu::type, pCU->m_pSubMenu->GetSafeHmenu());
+ 		Py_INCREF(Py_None);
+ 		return Py_None;
  	}
  	return ui_assoc_object::getattr(name);