X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/54f9ee450905e98296e6afd1376b3d1e06a1e00f..59ccbf7fec7543fb2629f195592cb8aa67aa143b:/wxPython/src/core.i

diff --git a/wxPython/src/core.i b/wxPython/src/core.i
index 5dd883fdc1..a67cd8b9b5 100644
--- a/wxPython/src/core.i
+++ b/wxPython/src/core.i
@@ -10,11 +10,12 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-%module _core
+%module(package="wx") _core
 
 %{
 #include "wx/wxPython/wxPython_int.h"
 #include "wx/wxPython/pyclasses.h"
+#include "wx/wxPython/twoitem.h"
 %}
 
 
@@ -25,10 +26,9 @@
 %include my_typemaps.i
 
 %include _core_api.i
-%include __core_rename.i
 
 %native(_wxPySetDictionary)   __wxPySetDictionary;
-%native(_wxPyFixStockObjects) __wxPyFixStockObjects;
+
 
 %pythoncode {
 %#// Give a reference to the dictionary of this module to the C++ extension
@@ -39,11 +39,32 @@ _core_._wxPySetDictionary(vars())
 %#// be used here.
 import sys as _sys
 wx = _sys.modules[__name__]
-}
 
+}
 #endif
 
 
+%pythoncode {
+%#----------------------------------------------------------------------------
+
+def _deprecated(callable, msg=None):
+    """
+    Create a wrapper function that will raise a DeprecationWarning
+    before calling the callable.
+    """
+    if msg is None:
+        msg = "%s is deprecated" % callable
+    def deprecatedWrapper(*args, **kwargs):
+        import warnings
+        warnings.warn(msg, DeprecationWarning, stacklevel=2)
+        return callable(*args, **kwargs)
+    deprecatedWrapper.__doc__ = msg
+    return deprecatedWrapper
+    
+                   
+%#----------------------------------------------------------------------------
+}
+
 
 //---------------------------------------------------------------------------
 // Include all the files that make up the core module
@@ -53,6 +74,8 @@ wx = _sys.modules[__name__]
 
 MAKE_CONST_WXSTRING(EmptyString);
 
+%include _swigtype.i
+
 %include _obj.i
 %include _gdicmn.i
 %include _streams.i
@@ -64,6 +87,7 @@ MAKE_CONST_WXSTRING(EmptyString);
 %include _evthandler.i
 %include _event.i
 %include _app.i
+%include _evtloop.i
 %include _accel.i
 %include _window.i
 %include _validator.i