Minor tweaks to bring up to date with CVS changes

[wxWidgets.git] / wxPython / src / core.i

diff --git a/wxPython/src/core.i b/wxPython/src/core.i
index 5dd883fdc1e8be30223a737703360ecc166c22fb..40a6648a2cb1804e5104021c946868f83ba48b99 100644 (file)
--- a/wxPython/src/core.i
+++ b/wxPython/src/core.i
@@ -10,7 +10,7 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-%module _core
+%module(package="wx") _core
 
 %{
 #include "wx/wxPython/wxPython_int.h"
@@ -30,6 +30,7 @@
 %native(_wxPySetDictionary)   __wxPySetDictionary;
 %native(_wxPyFixStockObjects) __wxPyFixStockObjects;
 
+
 %pythoncode {
 %#// Give a reference to the dictionary of this module to the C++ extension
 %#// code.
@@ -39,11 +40,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 +75,8 @@ wx = _sys.modules[__name__]
 
 MAKE_CONST_WXSTRING(EmptyString);
 
+%include _swigtype.i
+
 %include _obj.i
 %include _gdicmn.i
 %include _streams.i
@@ -64,6 +88,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