Patches from KevinO that work around issues where the widget isn't

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

diff --git a/wxPython/src/misc.i b/wxPython/src/misc.i
index 7c91999f135f4259c1a0ab6a7cdd34455ebbafe0..a6b6a4990436d25ad4f2a08f6796c92418b0c03f 100644 (file)
--- a/wxPython/src/misc.i
+++ b/wxPython/src/misc.i
@@ -10,8 +10,7 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-
-%module misc
+%module _misc
 
 //---------------------------------------------------------------------------
 
@@ -20,18 +19,19 @@
 #include "wx/wxPython/pyclasses.h"
 #include "wx/wxPython/pyistream.h"
     
-    DECLARE_DEF_STRING(EmptyString);
-    
 %}
 
 //---------------------------------------------------------------------------
 
 %import core.i
-%pythoncode { wx = core }
+%pythoncode { wx = _core }
+%pythoncode { __docfilter__ = wx.__docfilter__ }
 
-%include _misc_rename.i
+%include __misc_rename.i
 
 
+MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
+
 
 // Include all the files that make up this module
 %include _settings.i
@@ -42,7 +42,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 +50,6 @@
 %include _dataobj.i
 %include _dnd.i
 %include _clipbrd.i
-
+%include _display.i
 
 //---------------------------------------------------------------------------