Added autoconf makefiles for FoldBar extended samples

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

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

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

 
 //---------------------------------------------------------------------------
 
 %{
 #include "wx/wxPython/wxPython.h"
 #include "wx/wxPython/pyclasses.h"
 
 //---------------------------------------------------------------------------
 
 %{
 #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
 //---------------------------------------------------------------------------
 
 %import core.i

-%pythoncode { wx = core }
+%pythoncode { wx = _core }
+
+%include __controls_rename.i
+
+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 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
 
 //%include _control.i  <-- It's in core so other modules don't have to %import controls.i
 %include _button.i


@@ -56,6 +60,8 @@
 %include _pycontrol.i
 %include _cshelp.i
 %include _dragimg.i
 %include _pycontrol.i
 %include _cshelp.i
 %include _dragimg.i

+%include _datectrl.i
+

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