More adjustments to aliases

[wxWidgets.git] / wxPython / contrib / xrc / xrc.i

diff --git a/wxPython/contrib/xrc/xrc.i b/wxPython/contrib/xrc/xrc.i
index 2bab3a91449ddb50fe9b5d3561b2ff2fd3f48409..37612db90a28845a6f1a1cb2d17531b181484573 100644 (file)
--- a/wxPython/contrib/xrc/xrc.i
+++ b/wxPython/contrib/xrc/xrc.i
@@ -21,14 +21,6 @@
 #include <wx/xml/xml.h>
 #include <wx/xrc/xmlres.h>
 
 #include <wx/xml/xml.h>
 #include <wx/xrc/xmlres.h>
 

-    static const wxString wxPyEmptyString(wxT(""));
-    static const wxString wxPyUTF8String(wxT("UTF-8"));
-    static const wxString wxPyStyleString(wxT("style"));
-    static const wxString wxPySizeString(wxT("size"));
-    static const wxString wxPyPosString(wxT("pos"));
-    static const wxString wxPyBitmapString(wxT("bitmap"));
-    static const wxString wxPyIconString(wxT("icon"));
-    static const wxString wxPyFontString(wxT("font"));

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


@@ -36,6 +28,17 @@
 %import core.i
 %pythoncode { wx = core }
 
 %import core.i
 %pythoncode { wx = core }
 

+
+MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
+MAKE_CONST_WXSTRING2(UTF8String, "UTF-8");
+MAKE_CONST_WXSTRING2(StyleString, "style");
+MAKE_CONST_WXSTRING2(SizeString, "size");
+MAKE_CONST_WXSTRING2(PosString, "pos");
+MAKE_CONST_WXSTRING2(BitmapString, "bitmap");
+MAKE_CONST_WXSTRING2(IconString, "icon");
+MAKE_CONST_WXSTRING2(FontString, "font");
+
+

 %include _xrc_rename.i
 
 
 %include _xrc_rename.i