Added the wx.combo module, which contains the ComboCtrl and ComboPopup

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

diff --git a/wxPython/src/controls.i b/wxPython/src/controls.i
index ce2dfcc5ebbf3fe7ab13d05d9f45b17bfb17194c..073ac752c7de58684afab0c26b6e5ae5992531a5 100644 (file)
--- a/wxPython/src/controls.i
+++ b/wxPython/src/controls.i
@@ -10,29 +10,31 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-%module controls
+%module(package="wx") _controls
 
 //---------------------------------------------------------------------------
 
 %{
 #include "wx/wxPython/wxPython.h"
 #include "wx/wxPython/pyclasses.h"
-
-    DECLARE_DEF_STRING(PanelNameStr);
-    DECLARE_DEF_STRING(EmptyString);
-    DECLARE_DEF_STRING(ControlNameStr);
-
 %}
-
+    
 //---------------------------------------------------------------------------
 
 %import core.i
-%pythoncode { wx = core }
+%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
 
-%include _controls_rename.i
 
 //%include _control.i  <-- It's in core so other modules don't have to %import controls.i
 %include _button.i
@@ -56,6 +58,10 @@
 %include _pycontrol.i
 %include _cshelp.i
 %include _dragimg.i
+%include _datectrl.i
+%include _hyperlink.i
+%include _picker.i
+%include _collpane.i
 
 
 //---------------------------------------------------------------------------