Another merge of 2.6 changes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-17 05:42:30 +00:00
parent f3ebbc0ac8
commit 4617be085f
21 changed files with 241 additions and 43 deletions
--- a/wxPython/src/_core_api.i
+++ b/wxPython/src/_core_api.i
@@ -21,7 +21,7 @@
 // in the wrapper code.

 #include <wx/hashmap.h>
-WX_DECLARE_STRING_HASH_MAP( swig_type_info*, wxPyTypeInfoHashMap );
+    WX_DECLARE_STRING_HASH_MAP( swig_type_info*, wxPyTypeInfoHashMap );


 // Maintains a hashmap of className to swig_type_info pointers.  Given the