[pywin32-checkins] pywin32/Pythonwin pythonpsheet.cpp, 1.4.2.2, 1.4.2.3 win32control.h, 1.1.4.2, 1.1.4.3 win32uimodule.cpp, 1.39.2.13, 1.39.2.14 win32view.cpp, 1.4.2.3, 1.4.2.4

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

Update of /cvsroot/pywin32/pywin32/Pythonwin
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4460/Pythonwin

Modified Files:
      Tag: py3k
	pythonpsheet.cpp win32control.h win32uimodule.cpp 
	win32view.cpp 
Log Message:
merge lots of changes from the trunk

Index: win32view.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/win32view.cpp,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -C2 -d -r1.4.2.3 -r1.4.2.4
*** win32view.cpp	28 Dec 2008 10:55:49 -0000	1.4.2.3
--- win32view.cpp	14 Jan 2009 12:42:02 -0000	1.4.2.4
***************
*** 690,709 ****
  								GET_PY_CTOR(PyCCtrlView));
  
- /* Inheritance from PyCView and control type is now done via tp_bases */
- /*
- PyObject *
- PyCCtrlView::getattr(char *name)
- {
- 	// implement inheritance.
- 	PyObject *retMethod = PyCView::getattr(name);
- 	if (!retMethod) {
- 		PyErr_Clear();
- 		PyCCtrlView_Type *thisType = (PyCCtrlView_Type *)ob_type;
- 		if (thisType)
- 			retMethod = Py_FindMethod(thisType->control->methods, (PyObject *)this, name);
- 	}
- 	return retMethod;
- }
- */
  
  /////////////////////////////////////////////////////////////////////
--- 690,693 ----

Index: win32uimodule.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/win32uimodule.cpp,v
retrieving revision 1.39.2.13
retrieving revision 1.39.2.14
diff -C2 -d -r1.39.2.13 -r1.39.2.14
*** win32uimodule.cpp	8 Jan 2009 02:14:14 -0000	1.39.2.13
--- win32uimodule.cpp	14 Jan 2009 12:42:02 -0000	1.39.2.14
***************
*** 380,384 ****
  
  struct PyMethodDef ui_base_class_methods[] = {
- 	// {"GetMethodByType", ui_base_class_GetMethodByType, 1},
  	{NULL,	NULL}
  };
--- 380,383 ----
***************
*** 2025,2028 ****
--- 2024,2034 ----
  #endif
  	ADD_CONSTANT(debug); // @const win32ui|debug|1 if we are current using a _DEBUG build of win32ui, else 0.
+         if (PyModule_AddIntConstant(module, "UNICODE",
+ #ifdef UNICODE
+                                                         1
+ #else
+                                                         0
+ #endif
+                                                          ) == -1) return -1;
  	ADD_CONSTANT(AFX_IDW_PANE_FIRST); // @const win32ui|AFX_IDW_PANE_FIRST|Id of the first splitter pane
  	ADD_CONSTANT(AFX_IDW_PANE_LAST);  // @const win32ui|AFX_IDW_PANE_LAST|Id of the last splitter pane

Index: win32control.h
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/win32control.h,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -C2 -d -r1.1.4.2 -r1.1.4.3
*** win32control.h	28 Dec 2008 10:55:49 -0000	1.1.4.2
--- win32control.h	14 Jan 2009 12:42:02 -0000	1.1.4.3
***************
*** 31,35 ****
  	MAKE_PY_CTOR(PyCCtrlView)
  	static PyCCtrlView_Type type;
- 	// PyObject * getattr(char *name);
  	static PyObject *create(PyObject *self, PyObject *args);
  protected:
--- 31,34 ----

Index: pythonpsheet.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pythonpsheet.cpp,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -C2 -d -r1.4.2.2 -r1.4.2.3
*** pythonpsheet.cpp	3 Jan 2009 04:45:16 -0000	1.4.2.2
--- pythonpsheet.cpp	14 Jan 2009 12:42:02 -0000	1.4.2.3
***************
*** 211,215 ****
  	if (!py_bob->is_uiobject(&ui_assoc_object::type)) {
  		TRACE("CVirtualHelper::CVirtualHelper Error: Call object is not of required type\n");
!                 Py_DECREF(py_bob);
  		return;
  	}
--- 211,215 ----
  	if (!py_bob->is_uiobject(&ui_assoc_object::type)) {
  		TRACE("CVirtualHelper::CVirtualHelper Error: Call object is not of required type\n");
! 		Py_DECREF(py_bob);
  		return;
  	}
***************
*** 225,229 ****
  		PyErr_Restore(t,v,tb);
  	}
!         Py_DECREF(py_bob);
  
          if (!m_customizeFont) {
--- 225,229 ----
  		PyErr_Restore(t,v,tb);
  	}
! 	Py_DECREF(py_bob);
  
          if (!m_customizeFont) {