Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes for the UNICODE build

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-01-06 21:17:32 +00:00
parent 0a64020858
commit 089142a562
7 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wxPython/contrib/gizmos/gizmos.i
View File

@@ -38,9 +38,9 @@
%pythoncode { wx = core } %pythoncode { wx = core }
MAKE_CONST_WXSTRING2(DynamicSashNameStr, "dynamicSashWindow"); MAKE_CONST_WXSTRING2(DynamicSashNameStr, wxT("dynamicSashWindow"));
MAKE_CONST_WXSTRING2(EditableListBoxNameStr, "editableListBox"); MAKE_CONST_WXSTRING2(EditableListBoxNameStr, wxT("editableListBox"));
MAKE_CONST_WXSTRING2(TreeListCtrlNameStr, "treelistctrl"); MAKE_CONST_WXSTRING2(TreeListCtrlNameStr, wxT("treelistctrl"));
MAKE_CONST_WXSTRING_NOSWIG(EmptyString); MAKE_CONST_WXSTRING_NOSWIG(EmptyString);

2
wxPython/contrib/glcanvas/glcanvas.i
View File

@@ -27,7 +27,7 @@
%pythoncode { wx = core } %pythoncode { wx = core }
MAKE_CONST_WXSTRING2(GLCanvasNameStr, "GLCanvas"); MAKE_CONST_WXSTRING2(GLCanvasNameStr, wxT("GLCanvas"));
MAKE_CONST_WXSTRING_NOSWIG(EmptyString); MAKE_CONST_WXSTRING_NOSWIG(EmptyString);

14
wxPython/contrib/xrc/xrc.i
View File

@@ -30,13 +30,13 @@
MAKE_CONST_WXSTRING_NOSWIG(EmptyString); MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
MAKE_CONST_WXSTRING2(UTF8String, "UTF-8"); MAKE_CONST_WXSTRING2(UTF8String, wxT("UTF-8"));
MAKE_CONST_WXSTRING2(StyleString, "style"); MAKE_CONST_WXSTRING2(StyleString, wxT("style"));
MAKE_CONST_WXSTRING2(SizeString, "size"); MAKE_CONST_WXSTRING2(SizeString, wxT("size"));
MAKE_CONST_WXSTRING2(PosString, "pos"); MAKE_CONST_WXSTRING2(PosString, wxT("pos"));
MAKE_CONST_WXSTRING2(BitmapString, "bitmap"); MAKE_CONST_WXSTRING2(BitmapString, wxT("bitmap"));
MAKE_CONST_WXSTRING2(IconString, "icon"); MAKE_CONST_WXSTRING2(IconString, wxT("icon"));
MAKE_CONST_WXSTRING2(FontString, "font"); MAKE_CONST_WXSTRING2(FontString, wxT("font"));
%include _xrc_rename.i %include _xrc_rename.i

10
wxPython/demo/Cursor.py
View File

@@ -56,9 +56,9 @@ class TestPanel(wx.Panel):
self.tx = wx.StaticText(self, -1, self.tx = wx.StaticText(self, -1,
"This sample allows you to see all the stock cursors \n" "This sample allows you to see all the stock cursors \n"
"available to wxPython. Simply select a name from the \n" "available to wxPython. Simply select a name from the \n"
"wx.Choice and then move the mouse into the window below \n" "wx.Choice and then move the mouse into the window \n"
"to see the cursor. NOTE: not all stock cursors have a \n" "below to see the cursor. NOTE: not all stock cursors \n"
"specific representaion on all platforms.") "have a specific representaion on all platforms.")
self.win = wx.Window(self, -1, size=(200,200), style=wx.SIMPLE_BORDER) self.win = wx.Window(self, -1, size=(200,200), style=wx.SIMPLE_BORDER)
self.win.SetBackgroundColour("white") self.win.SetBackgroundColour("white")
@@ -70,8 +70,8 @@ class TestPanel(wx.Panel):
# Setup the layout # Setup the layout
gbs = wx.GridBagSizer() gbs = wx.GridBagSizer()
gbs.Add(self.cb, (2,2)) gbs.Add(self.cb, (2,1))
gbs.Add(self.tx, (2,4)) gbs.Add(self.tx, (2,3))
gbs.Add(self.win, (5,0), (1, 6), wx.ALIGN_CENTER) gbs.Add(self.win, (5,0), (1, 6), wx.ALIGN_CENTER)
self.SetSizer(gbs) self.SetSizer(gbs)

2
wxPython/distrib/build_renamers.py
View File

@@ -211,7 +211,7 @@ def processXML(xmlfile, modname, swigFile, pyFile):
addWX = True addWX = True
if doRename: if doRename and name:
old = new = name old = new = name
if old.startswith('wx') and not old.startswith('wxEVT_'): if old.startswith('wx') and not old.startswith('wxEVT_'):
# remove all wx prefixes except wxEVT_ and write a %rename directive for it # remove all wx prefixes except wxEVT_ and write a %rename directive for it

2
wxPython/src/_defs.i
View File

@@ -65,7 +65,7 @@ typedef unsigned char byte;
%enddef %enddef
%define MAKE_CONST_WXSTRING2(strname, val) %define MAKE_CONST_WXSTRING2(strname, val)
%{ static const wxString wxPy##strname(wxT(val)); %} %{ static const wxString wxPy##strname(val); %}
%immutable; %immutable;
%name(strname) const wxString wxPy##strname; %name(strname) const wxString wxPy##strname;
%mutable; %mutable;

6
wxPython/src/html.i
View File

@@ -35,9 +35,9 @@
MAKE_CONST_WXSTRING_NOSWIG(EmptyString); MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
MAKE_CONST_WXSTRING2(HtmlWindowNameStr, "htmlWindow") MAKE_CONST_WXSTRING2(HtmlWindowNameStr, wxT("htmlWindow"))
MAKE_CONST_WXSTRING2(HtmlPrintoutTitleStr, "Printout") MAKE_CONST_WXSTRING2(HtmlPrintoutTitleStr, wxT("Printout"))
MAKE_CONST_WXSTRING2(HtmlPrintingTitleStr, "Printing") MAKE_CONST_WXSTRING2(HtmlPrintingTitleStr, wxT("Printing"))
// TODO: Split this file into multiple %included files that coresponds to the // TODO: Split this file into multiple %included files that coresponds to the