From 089142a562148d69dbccfba669b66eff78a7f5b5 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Tue, 6 Jan 2004 21:17:32 +0000 Subject: [PATCH] Fixes for the UNICODE build git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/contrib/gizmos/gizmos.i | 6 +++--- wxPython/contrib/glcanvas/glcanvas.i | 2 +- wxPython/contrib/xrc/xrc.i | 14 +++++++------- wxPython/demo/Cursor.py | 10 +++++----- wxPython/distrib/build_renamers.py | 2 +- wxPython/src/_defs.i | 2 +- wxPython/src/html.i | 6 +++--- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/wxPython/contrib/gizmos/gizmos.i b/wxPython/contrib/gizmos/gizmos.i index 5c2426d295..3a6c5e88b1 100644 --- a/wxPython/contrib/gizmos/gizmos.i +++ b/wxPython/contrib/gizmos/gizmos.i @@ -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); diff --git a/wxPython/contrib/glcanvas/glcanvas.i b/wxPython/contrib/glcanvas/glcanvas.i index 2698732dbd..43fb6b8c57 100644 --- a/wxPython/contrib/glcanvas/glcanvas.i +++ b/wxPython/contrib/glcanvas/glcanvas.i @@ -27,7 +27,7 @@ %pythoncode { wx = core } -MAKE_CONST_WXSTRING2(GLCanvasNameStr, "GLCanvas"); +MAKE_CONST_WXSTRING2(GLCanvasNameStr, wxT("GLCanvas")); MAKE_CONST_WXSTRING_NOSWIG(EmptyString); diff --git a/wxPython/contrib/xrc/xrc.i b/wxPython/contrib/xrc/xrc.i index 37612db90a..59d26bf353 100644 --- a/wxPython/contrib/xrc/xrc.i +++ b/wxPython/contrib/xrc/xrc.i @@ -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 diff --git a/wxPython/demo/Cursor.py b/wxPython/demo/Cursor.py index d5cea526f7..8d05e7cb2c 100644 --- a/wxPython/demo/Cursor.py +++ b/wxPython/demo/Cursor.py @@ -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) diff --git a/wxPython/distrib/build_renamers.py b/wxPython/distrib/build_renamers.py index e5f16ed19c..5a56b9214b 100755 --- a/wxPython/distrib/build_renamers.py +++ b/wxPython/distrib/build_renamers.py @@ -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 diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i index cb02767991..e8b4f7fdd1 100644 --- a/wxPython/src/_defs.i +++ b/wxPython/src/_defs.i @@ -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; diff --git a/wxPython/src/html.i b/wxPython/src/html.i index 7449fdff7a..5c2e764a1f 100644 --- a/wxPython/src/html.i +++ b/wxPython/src/html.i @@ -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 -- 2.47.2