PrintFramework fixes

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

diff --git a/wxPython/src/core.i b/wxPython/src/core.i
index 3793026d6f7e0fa8d64be2ee762a672674e50864..be891ef234d4af9e0e02cbc041d74f44b8ab3759 100644 (file)
--- a/wxPython/src/core.i
+++ b/wxPython/src/core.i
@@ -28,9 +28,8 @@
 %include _core_api.i
 %include _core_rename.i
 
 %include _core_api.i
 %include _core_rename.i
 

-
-

 %native(_wxPySetDictionary)   __wxPySetDictionary;
 %native(_wxPySetDictionary)   __wxPySetDictionary;

+%native(_wxPyFixStockObjects) __wxPyFixStockObjects;

 
 %pythoncode {
 %#// Give a reference to the dictionary of this module to the C++ extension
 
 %pythoncode {
 %#// Give a reference to the dictionary of this module to the C++ extension


@@ -45,18 +44,16 @@ wx = _sys.modules[__name__]
 
 #endif
 
 
 #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
 
 //---------------------------------------------------------------------------
 // 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
 %include _obj.i
 %include _gdicmn.i
 %include _streams.i


@@ -68,6 +65,7 @@ wx = _sys.modules[__name__]
 %include _evthandler.i
 %include _event.i
 %include _app.i
 %include _evthandler.i
 %include _event.i
 %include _app.i

+%include _accel.i

 %include _window.i
 %include _validator.i
 %include _menu.i
 %include _window.i
 %include _validator.i
 %include _menu.i