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

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

diff --git a/wxPython/src/core.i b/wxPython/src/core.i
index a41427188ffec0bf0543c8a3aefdbc76633ed30b..5dd883fdc1e8be30223a737703360ecc166c22fb 100644 (file)
--- a/wxPython/src/core.i
+++ b/wxPython/src/core.i
@@ -10,8 +10,7 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-%module core
-
+%module _core
 
 %{
 #include "wx/wxPython/wxPython_int.h"
@@ -26,7 +25,7 @@
 %include my_typemaps.i
 
 %include _core_api.i
-%include _core_rename.i
+%include __core_rename.i
 
 %native(_wxPySetDictionary)   __wxPySetDictionary;
 %native(_wxPyFixStockObjects) __wxPyFixStockObjects;
@@ -34,7 +33,7 @@
 %pythoncode {
 %#// Give a reference to the dictionary of this module to the C++ extension
 %#// code.
-_core._wxPySetDictionary(vars())
+_core_._wxPySetDictionary(vars())
 
 %#// A little trick to make 'wx' be a reference to this module so wx.Names can
 %#// be used here.
@@ -44,18 +43,16 @@ wx = _sys.modules[__name__]
 
 #endif
 
-//---------------------------------------------------------------------------
 
-%{
-    DECLARE_DEF_STRING(EmptyString);
-//    DECLARE_DEF_STRING(PanelNameStr);
-%}
 
 //---------------------------------------------------------------------------
 // Include all the files that make up the core module
 
 // wxObject, functions and other base stuff
 %include _defs.i
+
+MAKE_CONST_WXSTRING(EmptyString);
+
 %include _obj.i
 %include _gdicmn.i
 %include _streams.i