reSWIGged

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

diff --git a/wxPython/src/windows.i b/wxPython/src/windows.i
index f7386680f2dd10e9dfa8f03b1d49f1828fe1d868..dc94478a1157c602e6ec08dfe3f4b3ecd078ef04 100644 (file)
--- a/wxPython/src/windows.i
+++ b/wxPython/src/windows.i
@@ -10,8 +10,7 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-
-%module windows
+%module(package="wx") _windows
 
 //---------------------------------------------------------------------------
 
@@ -19,22 +18,20 @@
 #include "wx/wxPython/wxPython.h"
 #include "wx/wxPython/pyclasses.h"
     
-    DECLARE_DEF_STRING(PanelNameStr);
-    DECLARE_DEF_STRING(EmptyString);
-    
 %}
 
 //---------------------------------------------------------------------------
 
 %import core.i
-%pythoncode { wx = core }
+%pythoncode { wx = _core }
+
 
-%include _windows_rename.i
+MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
+MAKE_CONST_WXSTRING_NOSWIG(PanelNameStr);
 
 
 // Include all the files that make up this module
 %include _panel.i
-%include _accel.i
 %include _toplvl.i
 %include _statusbar.i
 %include _splitter.i