applied patch 1378261

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

diff --git a/wxPython/src/misc.i b/wxPython/src/misc.i
index 7c91999f135f4259c1a0ab6a7cdd34455ebbafe0..a9c849a562370d7fec1f6542fbd1807424868bde 100644 (file)
--- a/wxPython/src/misc.i
+++ b/wxPython/src/misc.i
@@ -10,27 +10,25 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-
-%module misc
+%module(package="wx") _misc
 
 //---------------------------------------------------------------------------
 
 %{
 #include "wx/wxPython/wxPython.h"
 #include "wx/wxPython/pyclasses.h"
-#include "wx/wxPython/pyistream.h"
-    
-    DECLARE_DEF_STRING(EmptyString);
-    
+#include "wx/wxPython/pyistream.h"    
 %}
 
 //---------------------------------------------------------------------------
 
 %import core.i
-%pythoncode { wx = core }
+%pythoncode { wx = _core }
+
+%include __misc_rename.i
 
-%include _misc_rename.i
 
+MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
 
 
 // Include all the files that make up this module
@@ -42,7 +40,7 @@
 %include _log.i
 %include _process.i
 %include _joystick.i
-%include _wave.i
+%include _sound.i
 %include _mimetype.i
 %include _artprov.i
 %include _config.i
@@ -50,6 +48,7 @@
 %include _dataobj.i
 %include _dnd.i
 %include _clipbrd.i
-
+%include _display.i
+%include _stdpaths.i
 
 //---------------------------------------------------------------------------