Fixes for the UNICODE build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		@@ -38,9 +38,9 @@
 | 
			
		||||
%pythoncode { wx = core }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
MAKE_CONST_WXSTRING2(DynamicSashNameStr, "dynamicSashWindow");
 | 
			
		||||
MAKE_CONST_WXSTRING2(EditableListBoxNameStr, "editableListBox");
 | 
			
		||||
MAKE_CONST_WXSTRING2(TreeListCtrlNameStr, "treelistctrl");
 | 
			
		||||
MAKE_CONST_WXSTRING2(DynamicSashNameStr,     wxT("dynamicSashWindow"));
 | 
			
		||||
MAKE_CONST_WXSTRING2(EditableListBoxNameStr, wxT("editableListBox"));
 | 
			
		||||
MAKE_CONST_WXSTRING2(TreeListCtrlNameStr,    wxT("treelistctrl"));
 | 
			
		||||
 | 
			
		||||
MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -27,7 +27,7 @@
 | 
			
		||||
%pythoncode { wx = core }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
MAKE_CONST_WXSTRING2(GLCanvasNameStr, "GLCanvas");
 | 
			
		||||
MAKE_CONST_WXSTRING2(GLCanvasNameStr, wxT("GLCanvas"));
 | 
			
		||||
MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -30,13 +30,13 @@
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
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");
 | 
			
		||||
MAKE_CONST_WXSTRING2(UTF8String,   wxT("UTF-8"));
 | 
			
		||||
MAKE_CONST_WXSTRING2(StyleString,  wxT("style"));
 | 
			
		||||
MAKE_CONST_WXSTRING2(SizeString,   wxT("size"));
 | 
			
		||||
MAKE_CONST_WXSTRING2(PosString,    wxT("pos"));
 | 
			
		||||
MAKE_CONST_WXSTRING2(BitmapString, wxT("bitmap"));
 | 
			
		||||
MAKE_CONST_WXSTRING2(IconString,   wxT("icon"));
 | 
			
		||||
MAKE_CONST_WXSTRING2(FontString,   wxT("font"));
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
%include _xrc_rename.i
 | 
			
		||||
 
 | 
			
		||||
@@ -56,9 +56,9 @@ class TestPanel(wx.Panel):
 | 
			
		||||
        self.tx = wx.StaticText(self, -1,                                
 | 
			
		||||
             "This sample allows you to see all the stock cursors \n"
 | 
			
		||||
             "available to wxPython.  Simply select a name from the \n"
 | 
			
		||||
             "wx.Choice and then move the mouse into the window below \n"
 | 
			
		||||
             "to see the cursor.  NOTE: not all stock cursors have a \n"
 | 
			
		||||
             "specific representaion on all platforms.")
 | 
			
		||||
             "wx.Choice and then move the mouse into the window \n"
 | 
			
		||||
             "below to see the cursor.  NOTE: not all stock cursors \n"
 | 
			
		||||
             "have a specific representaion on all platforms.")
 | 
			
		||||
        
 | 
			
		||||
        self.win = wx.Window(self, -1, size=(200,200), style=wx.SIMPLE_BORDER)
 | 
			
		||||
        self.win.SetBackgroundColour("white")
 | 
			
		||||
@@ -70,8 +70,8 @@ class TestPanel(wx.Panel):
 | 
			
		||||
 | 
			
		||||
        # Setup the layout
 | 
			
		||||
        gbs = wx.GridBagSizer()
 | 
			
		||||
        gbs.Add(self.cb, (2,2))
 | 
			
		||||
        gbs.Add(self.tx, (2,4))
 | 
			
		||||
        gbs.Add(self.cb, (2,1))
 | 
			
		||||
        gbs.Add(self.tx, (2,3))
 | 
			
		||||
        gbs.Add(self.win, (5,0), (1, 6), wx.ALIGN_CENTER)
 | 
			
		||||
        self.SetSizer(gbs)
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -211,7 +211,7 @@ def processXML(xmlfile, modname, swigFile, pyFile):
 | 
			
		||||
                addWX = True
 | 
			
		||||
               
 | 
			
		||||
 | 
			
		||||
        if doRename:
 | 
			
		||||
        if doRename and name:
 | 
			
		||||
            old = new = name
 | 
			
		||||
            if old.startswith('wx') and not old.startswith('wxEVT_'):
 | 
			
		||||
                # remove all wx prefixes except wxEVT_ and write a %rename directive for it
 | 
			
		||||
 
 | 
			
		||||
@@ -65,7 +65,7 @@ typedef unsigned char   byte;
 | 
			
		||||
%enddef
 | 
			
		||||
 | 
			
		||||
%define MAKE_CONST_WXSTRING2(strname, val)
 | 
			
		||||
    %{ static const wxString wxPy##strname(wxT(val)); %}
 | 
			
		||||
    %{ static const wxString wxPy##strname(val); %}
 | 
			
		||||
    %immutable;
 | 
			
		||||
    %name(strname) const wxString wxPy##strname;
 | 
			
		||||
    %mutable;
 | 
			
		||||
 
 | 
			
		||||
@@ -35,9 +35,9 @@
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
 | 
			
		||||
MAKE_CONST_WXSTRING2(HtmlWindowNameStr, "htmlWindow")
 | 
			
		||||
MAKE_CONST_WXSTRING2(HtmlPrintoutTitleStr, "Printout")
 | 
			
		||||
MAKE_CONST_WXSTRING2(HtmlPrintingTitleStr, "Printing")
 | 
			
		||||
MAKE_CONST_WXSTRING2(HtmlWindowNameStr,    wxT("htmlWindow"))
 | 
			
		||||
MAKE_CONST_WXSTRING2(HtmlPrintoutTitleStr, wxT("Printout"))
 | 
			
		||||
MAKE_CONST_WXSTRING2(HtmlPrintingTitleStr, wxT("Printing"))
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
// TODO: Split this file into multiple %included files that coresponds to the
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user