Applied patch #1441370: lib.plot - allow passing in wx.Colour()

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

diff --git a/wxPython/src/controls.i b/wxPython/src/controls.i
index 258bdbc095e5b62d6d0306b9f1c316d5c5ae3970..28867cb1635b3f0d6bea4116130bcd22ac278a86 100644 (file)
--- a/wxPython/src/controls.i
+++ b/wxPython/src/controls.i
@@ -10,7 +10,7 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-%module controls
+%module(package="wx") _controls

 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 


@@ -22,10 +22,9 @@
 //---------------------------------------------------------------------------
 
 %import core.i
 //---------------------------------------------------------------------------
 
 %import core.i

-%pythoncode { wx = core }
-%pythoncode { __docfilter__ = wx.__docfilter__ }
+%pythoncode { wx = _core }

 
 

-%include _controls_rename.i
+%include __controls_rename.i

 
 MAKE_CONST_WXSTRING_NOSWIG(PanelNameStr);
 MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
 
 MAKE_CONST_WXSTRING_NOSWIG(PanelNameStr);
 MAKE_CONST_WXSTRING_NOSWIG(EmptyString);


@@ -61,6 +60,8 @@ MAKE_CONST_WXSTRING_NOSWIG(ControlNameStr);
 %include _pycontrol.i
 %include _cshelp.i
 %include _dragimg.i
 %include _pycontrol.i
 %include _cshelp.i
 %include _dragimg.i

+%include _datectrl.i
+

 
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------