move the include of collpane.h to the main header

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

diff --git a/wxPython/src/controls.i b/wxPython/src/controls.i
index 502b4346fcc8d6a40084be3c5fa9312348b8e6f8..073ac752c7de58684afab0c26b6e5ae5992531a5 100644 (file)
--- a/wxPython/src/controls.i
+++ b/wxPython/src/controls.i
@@ -10,7 +10,7 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-%module controls
+%module(package="wx") _controls
 
 //---------------------------------------------------------------------------
 
@@ -22,14 +22,16 @@
 //---------------------------------------------------------------------------
 
 %import core.i
-%pythoncode { wx = core }
-
-%include _controls_rename.i
+%pythoncode { wx = _core }
 
 MAKE_CONST_WXSTRING_NOSWIG(PanelNameStr);
 MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
 MAKE_CONST_WXSTRING_NOSWIG(ControlNameStr);
 
+%{
+    const wxArrayString wxPyEmptyStringArray;
+%}
+
 
 // Include all the files that make up this module
 
@@ -56,6 +58,10 @@ MAKE_CONST_WXSTRING_NOSWIG(ControlNameStr);
 %include _pycontrol.i
 %include _cshelp.i
 %include _dragimg.i
+%include _datectrl.i
+%include _hyperlink.i
+%include _picker.i
+%include _collpane.i
 
 
 //---------------------------------------------------------------------------