Better conversion functions for integral and floating point types,

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

diff --git a/wxPython/src/misc.i b/wxPython/src/misc.i
index 7c91999f135f4259c1a0ab6a7cdd34455ebbafe0..37342395a00ba00a2a05c7d4c0b5fa7fe6657b8c 100644 (file)
--- a/wxPython/src/misc.i
+++ b/wxPython/src/misc.i
@@ -20,8 +20,6 @@
 #include "wx/wxPython/pyclasses.h"
 #include "wx/wxPython/pyistream.h"
     
 #include "wx/wxPython/pyclasses.h"
 #include "wx/wxPython/pyistream.h"
     

-    DECLARE_DEF_STRING(EmptyString);
-    

 %}
 
 //---------------------------------------------------------------------------
 %}
 
 //---------------------------------------------------------------------------


@@ -32,6 +30,8 @@
 %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
 
 // 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 _log.i
 %include _process.i
 %include _joystick.i

-%include _wave.i
+%include _sound.i

 %include _mimetype.i
 %include _artprov.i
 %include _config.i
 %include _mimetype.i
 %include _artprov.i
 %include _config.i


@@ -50,6 +50,6 @@
 %include _dataobj.i
 %include _dnd.i
 %include _clipbrd.i
 %include _dataobj.i
 %include _dnd.i
 %include _clipbrd.i

-
+%include _display.i

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