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

Lots of little bug fixes, API updates, etc.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24634 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-11-22 22:57:49 +00:00
parent f696721e0c
commit fd3f2efe79
46 changed files with 212 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wxPython/demo/ColourDB.py
View File

@@ -47,7 +47,7 @@ class TestWindow(wxScrolledWindow):
while x < sz.width:
y = -dy
while y < sz.height:
dc.DrawBitmap(self.bg_bmp, x, y)
dc.DrawBitmap(self.bg_bmp, (x, y))
y = y + h
x = x + w
@@ -89,11 +89,12 @@ class TestWindow(wxScrolledWindow):
for line in range(max(0,start), min(stop,numColours)):
clr = colours[line]
y = (line+1) * self.lineHeight + 2
dc.DrawText(clr, self.cellWidth, y)
dc.DrawText(clr, (self.cellWidth, y))
brush = wxBrush(clr, wxSOLID)
dc.SetBrush(brush)
dc.DrawRectangle(12 * self.cellWidth, y, 6 * self.cellWidth, self.textHeight)
dc.DrawRectangle((12 * self.cellWidth, y),
(6 * self.cellWidth, self.textHeight))
dc.EndDrawing()

9
wxPython/demo/ContextHelp.py
View File

@@ -1,6 +1,5 @@
from wxPython.wx import *
from wxPython.help import *
#----------------------------------------------------------------------
# We first have to set an application-wide help provider. Normally you
@@ -27,25 +26,25 @@ class TestPanel(wxPanel):
s = wxBoxSizer(wxHORIZONTAL)
s.Add(cBtn, 0, wxALL, 5)
s.Add(cBtnText, 0, wxALL, 5)
sizer.Add(20,20)
sizer.Add((20,20))
sizer.Add(s)
text = wxTextCtrl(self, -1, "Each sub-window can have its own help message",
size=(240, 60), style = wxTE_MULTILINE)
text.SetHelpText("This is my very own help message. This is a really long long long long long long long long long long long long long long long long long long long long message!")
sizer.Add(20,20)
sizer.Add((20,20))
sizer.Add(text)
text = wxTextCtrl(self, -1, "You can also intercept the help event if you like. Watch the log window when you click here...",
size=(240, 60), style = wxTE_MULTILINE)
text.SetHelpText("Yet another context help message.")
sizer.Add(20,20)
sizer.Add((20,20))
sizer.Add(text)
EVT_HELP(text, text.GetId(), self.OnCtxHelp)
text = wxTextCtrl(self, -1, "This one displays the tip itself...",
size=(240, 60), style = wxTE_MULTILINE)
sizer.Add(20,20)
sizer.Add((20,20))
sizer.Add(text)
EVT_HELP(text, text.GetId(), self.OnCtxHelp2)

8
wxPython/demo/CustomDragAndDrop.py
View File

@@ -39,7 +39,7 @@ class DoodlePad(wxWindow):
dc.SetPen(wxPen(wxBLUE, 3))
for line in self.lines:
for coords in line:
apply(dc.DrawLine, coords)
dc.DrawLineXY(*coords)
dc.EndDrawing()
@@ -71,7 +71,7 @@ class DoodlePad(wxWindow):
dc.SetPen(wxPen(wxBLUE, 3))
coords = (self.x, self.y) + event.GetPositionTuple()
self.curLine.append(coords)
apply(dc.DrawLine, coords)
dc.DrawLineXY(*coords)
self.x, self.y = event.GetPositionTuple()
dc.EndDrawing()
@@ -197,7 +197,7 @@ class DoodleViewer(wxWindow):
dc.SetPen(wxPen(wxRED, 3))
for line in self.lines:
for coords in line:
apply(dc.DrawLine, coords)
dc.DrawLineXY(*coords)
dc.EndDrawing()
#----------------------------------------------------------------------
@@ -239,7 +239,7 @@ class CustomDnDPanel(wxPanel):
rbox.Add(rb2)
box.Add(text1, 0, wxALL, 10)
box.Add(rbox, 0, wxALIGN_CENTER)
box.Add(10,90)
box.Add((10,90))
box.Add(text2, 0, wxALL, 10)
sizer.Add(box)

2
wxPython/demo/DrawXXXList.py
View File

@@ -108,7 +108,7 @@ def makeRandomColors(num):
colors = []
for i in range(num):
c = whrandom.choice(colours)
colors.append(wxNamedColor(c))
colors.append(wxNamedColour(c))
return colors

24
wxPython/demo/EventManager.py
View File

@@ -52,17 +52,17 @@ class TestPanel(wxPanel):
message2 = wxStaticText(self, -1, txt)
message2.SetFont(f1)
targetPanel = Tile(self, log, bgColor=wxColor(80,10,10), active=0)
targetPanel = Tile(self, log, bgColor=wxColour(80,10,10), active=0)
buttonPanel = wxPanel(self ,-1)
sizer = wxBoxSizer(wxHORIZONTAL)
target = targetPanel.tile
sizer.Add(0,0,1)
sizer.Add((0,0), 1)
for factor in [0.2, 0.3, 0.4, 0.5, 0.6, 0.7]:
sizer.Add(Tile(buttonPanel, log, factor-0.05, target), 0, wxALIGN_CENTER)
sizer.Add(0,0,1)
sizer.Add((0,0),1)
sizer.Add(Tile(buttonPanel, log, factor, target), 0, wxALIGN_CENTER)
sizer.Add(0,0,1)
sizer.Add((0,0),1)
buttonPanel.SetAutoLayout(1)
buttonPanel.SetSizer(sizer)
@@ -88,9 +88,9 @@ class Tile(wxPanel):
its border color in response to certain mouse
events over its contained 'InnerTile'.
"""
normal = wxColor(150,150,150)
active = wxColor(250,245,245)
hover = wxColor(210,220,210)
normal = wxColour(150,150,150)
active = wxColour(250,245,245)
hover = wxColour(210,220,210)
def __init__(self, parent, log, factor=1, thingToWatch=None, bgColor=None, active=1, size=(38,38), borderWidth=3):
wxPanel.__init__(self, parent, -1, size=size, style=wxCLIP_CHILDREN)
@@ -128,10 +128,10 @@ class Tile(wxPanel):
class InnerTile(wxPanel):
IDLE_COLOR = wxColor( 80, 10, 10)
START_COLOR = wxColor(200, 70, 50)
FINAL_COLOR = wxColor( 20, 80,240)
OFF_COLOR = wxColor(185,190,185)
IDLE_COLOR = wxColour( 80, 10, 10)
START_COLOR = wxColour(200, 70, 50)
FINAL_COLOR = wxColour( 20, 80,240)
OFF_COLOR = wxColour(185,190,185)
# Some pre-computation.
DELTAS = map(lambda a,b: b-a, START_COLOR.Get(), FINAL_COLOR.Get())
START_COLOR_TUPLE = START_COLOR.Get()
@@ -188,7 +188,7 @@ class InnerTile(wxPanel):
r = InnerTile.START_COLOR_TUPLE[0] + (InnerTile.DELTAS[0] * percent)
g = InnerTile.START_COLOR_TUPLE[1] + (InnerTile.DELTAS[1] * percent)
b = InnerTile.START_COLOR_TUPLE[2] + (InnerTile.DELTAS[2] * percent)
self.setColor(wxColor(int(r), int(g), int(b)))
self.setColor(wxColour(int(r), int(g), int(b)))

8
wxPython/demo/Layoutf.py
View File

@@ -11,15 +11,15 @@ class TestLayoutf(wxPanel):
self.SetAutoLayout(True)
EVT_BUTTON(self, 100, self.OnButton)
self.panelA = wxWindow(self, -1, wxPyDefaultPosition, wxPyDefaultSize, wxSIMPLE_BORDER)
self.panelA = wxWindow(self, -1, style=wxSIMPLE_BORDER)
self.panelA.SetBackgroundColour(wxBLUE)
self.panelA.SetConstraints(Layoutf('t=t10#1;l=l10#1;b=b10#1;r%r50#1',(self,)))
self.panelB = wxWindow(self, -1, wxPyDefaultPosition, wxPyDefaultSize, wxSIMPLE_BORDER)
self.panelB = wxWindow(self, -1, style=wxSIMPLE_BORDER)
self.panelB.SetBackgroundColour(wxRED)
self.panelB.SetConstraints(Layoutf('t=t10#1;r=r10#1;b%b30#1;l>10#2', (self,self.panelA)))
self.panelC = wxWindow(self, -1, wxPyDefaultPosition, wxPyDefaultSize, wxSIMPLE_BORDER)
self.panelC = wxWindow(self, -1, style=wxSIMPLE_BORDER)
self.panelC.SetBackgroundColour(wxWHITE)
self.panelC.SetConstraints(Layoutf('t_10#3;r=r10#1;b=b10#1;l>10#2', (self,self.panelA,self.panelB)))
@@ -29,7 +29,7 @@ class TestLayoutf(wxPanel):
b = wxButton(self.panelB, 100, ' Panel B ')
b.SetConstraints(Layoutf('t=t2#1;r=r4#1;h*;w*', (self.panelB,)))
self.panelD = wxWindow(self.panelC, -1, wxPyDefaultPosition, wxPyDefaultSize, wxSIMPLE_BORDER)
self.panelD = wxWindow(self.panelC, -1, style=wxSIMPLE_BORDER)
self.panelD.SetBackgroundColour(wxGREEN)
self.panelD.SetConstraints(Layoutf('b%h50#1;r%w50#1;h=h#2;w=w#2', (self.panelC, b)))

1
wxPython/demo/Main.py
View File

@@ -143,6 +143,7 @@ _treeList = [
'wxIntCtrl',
'wxMimeTypesManager',
'wxMaskedNumCtrl',
'wxScrolledPanel',
'wxStyledTextCtrl_1',
'wxStyledTextCtrl_2',
'wxTimeCtrl',

2
wxPython/demo/PrintFramework.py
View File

@@ -80,7 +80,7 @@ class MyPrintout(wxPrintout):
#-------------------------------------------
self.canvas.DoDrawing(dc, True)
dc.DrawText("Page: %d" % page, marginX/2, maxY-marginY)
dc.DrawText("Page: %d" % page, (marginX/2, maxY-marginY))
return True

6
wxPython/demo/Sizers.py
View File

@@ -82,7 +82,7 @@ def makeSimpleBox7(win):
box.Add(wxButton(win, 1010, "one"), 0, wxEXPAND)
box.Add(wxButton(win, 1010, "two"), 0, wxEXPAND)
box.Add(wxButton(win, 1010, "three"), 0, wxEXPAND)
box.Add(60, 20, 0, wxEXPAND)
box.Add((60, 20), 0, wxEXPAND)
box.Add(wxButton(win, 1010, "five"), 1, wxEXPAND)
return box
@@ -92,9 +92,9 @@ def makeSimpleBox7(win):
def makeSimpleBox8(win):
box = wxBoxSizer(wxVERTICAL)
box.Add(wxButton(win, 1010, "one"), 0, wxEXPAND)
box.Add(0,0, 1)
box.Add((0,0), 1)
box.Add(wxButton(win, 1010, "two"), 0, wxALIGN_CENTER)
box.Add(0,0, 1)
box.Add((0,0), 1)
box.Add(wxButton(win, 1010, "three"), 0, wxEXPAND)
box.Add(wxButton(win, 1010, "four"), 0, wxEXPAND)
# box.Add(wxButton(win, 1010, "five"), 1, wxEXPAND)

8
wxPython/demo/Threads.py
View File

@@ -98,18 +98,18 @@ class GraphWindow(wxWindow):
dc.SetBackground(wxBrush(self.GetBackgroundColour()))
dc.Clear()
dc.SetPen(wxPen(wxBLACK, 3, wxSOLID))
dc.DrawLine(self.linePos, 0, self.linePos, size.height-10)
dc.DrawLine((self.linePos, 0), (self.linePos, size.height-10))
bh = ypos = self.barHeight
for x in range(len(self.values)):
label, val = self.values[x]
dc.DrawText(label, 5, ypos)
dc.DrawText(label, (5, ypos))
if val:
color = self.colors[ x % len(self.colors) ]
dc.SetPen(wxPen(color))
dc.SetBrush(wxBrush(color))
dc.DrawRectangle(self.linePos+3, ypos, val, bh)
dc.DrawRectangle((self.linePos+3, ypos), (val, bh))
ypos = ypos + 2*bh
if ypos > size.height-10:
@@ -125,7 +125,7 @@ class GraphWindow(wxWindow):
wdc = wxPaintDC(self)
wdc.BeginDrawing()
wdc.Blit(0,0, size.width, size.height, dc, 0,0)
wdc.Blit((0,0), size, dc, (0,0))
wdc.EndDrawing()
dc.SelectObject(wxNullBitmap)

6
wxPython/demo/URLDragAndDrop.py
View File

@@ -42,15 +42,15 @@ class TestPanel(wxPanel):
text.SetForegroundColour(wxBLUE)
outsideSizer.Add(text, 0, wxEXPAND|wxALL, 5)
outsideSizer.Add(wxStaticLine(self, -1), 0, wxEXPAND)
outsideSizer.Add(20,20)
outsideSizer.Add((20,20))
self.SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, False))
inSizer = wxFlexGridSizer(2, 2, 5, 5)
inSizer.AddGrowableCol(0)
inSizer.Add(20,20)
inSizer.Add(20,20)
inSizer.Add((20,20))
inSizer.Add((20,20))
inSizer.Add(wxStaticText(self, -1,
"Drag URLs from your browser to\nthis window:",
style = wxALIGN_RIGHT),

2
wxPython/demo/run.py
View File

@@ -48,7 +48,7 @@ class RunDemoApp(wx.App):
self.SetAssertMode(assertMode)
frame = wx.Frame(None, -1, "RunDemo: " + self.name, pos=(50,50), size=(0,0),
frame = wx.Frame(None, -1, "RunDemo: " + self.name, pos=(50,50), size=(200,100),
style=wx.NO_FULL_REPAINT_ON_RESIZE|wx.DEFAULT_FRAME_STYLE)
frame.CreateStatusBar()
menuBar = wx.MenuBar()

6
wxPython/demo/wxArtProvider.py
View File

@@ -126,9 +126,9 @@ class TestPanel(wxPanel):
fgs.AddWindow(cb, 0, wxALIGN_CENTRE|wxALL, 5)
EVT_CHECKBOX(self, cb.GetId(), self.OnUseCustom)
fgs.AddSpacer(10, 10, 0, wxALIGN_CENTRE|wxALL, 5)
fgs.AddSpacer(10, 10, 0, wxALIGN_CENTRE|wxALL, 5)
fgs.AddSpacer(10, 10, 0, wxALIGN_CENTRE|wxALL, 5)
fgs.Add((10, 10), 0, wxALIGN_CENTRE|wxALL, 5)
fgs.Add((10, 10), 0, wxALIGN_CENTRE|wxALL, 5)
fgs.Add((10, 10), 0, wxALIGN_CENTRE|wxALL, 5)
box = wxBoxSizer(wxVERTICAL)
bmp = wxEmptyBitmap(16,16)

20
wxPython/demo/wxCalendar.py
View File

@@ -612,17 +612,6 @@ def MessageDlg(self, message, type = 'Message'):
#---------------------------------------------------------------------------
def main():
app = MyApp(0)
app.MainLoop()
if __name__ == '__main__':
main()
#---------------------------------------------------------------------------
def runTest(frame, nb, log):
win = TestPanel(nb, log, frame)
return win
@@ -640,3 +629,12 @@ See example for various methods used to set display month, year, and highlighted
by Lorne White
"""
if __name__ == '__main__':
import sys,os
import run
run.main(['', os.path.basename(sys.argv[0])])

2
wxPython/demo/wxCalendarCtrl.py
View File

@@ -1,7 +1,7 @@
from wxPython.wx import *
from wxPython.calendar import *
from wxPython.utils import *
#----------------------------------------------------------------------

10
wxPython/demo/wxDragImage.py
View File

@@ -29,9 +29,9 @@ class DragShape:
memDC = wxMemoryDC()
memDC.SelectObject(self.bmp)
dc.Blit(self.pos.x, self.pos.y,
self.bmp.GetWidth(), self.bmp.GetHeight(),
memDC, 0, 0, op, True)
dc.Blit((self.pos.x, self.pos.y),
(self.bmp.GetWidth(), self.bmp.GetHeight()),
memDC, (0, 0), op, True)
return True
else:
@@ -74,7 +74,7 @@ class DragCanvas(wxScrolledWindow):
dc.Clear()
dc.SetTextForeground(wxRED)
dc.SetFont(font)
dc.DrawText(text, 0, 0)
dc.DrawText(text, (0, 0))
dc.SelectObject(wxNullBitmap)
mask = wxMaskColour(bmp, bg_colour)
bmp.SetMask(mask)
@@ -117,7 +117,7 @@ class DragCanvas(wxScrolledWindow):
while x < sz.width:
y = 0
while y < sz.height:
dc.DrawBitmap(self.bg_bmp, x, y)
dc.DrawBitmap(self.bg_bmp, (x, y))
y = y + h
x = x + w

2
wxPython/demo/wxHtmlWindow.py
View File

@@ -7,6 +7,8 @@ import wxPython.lib.wxpTag
from Main import opj
##wxTrap()
#----------------------------------------------------------------------
# This shows how to catch the OnLinkClicked non-event. (It's a virtual

10
wxPython/demo/wxIntCtrl.py
View File

@@ -33,14 +33,14 @@ class TestPanel( wxPanel ):
grid.AddWindow( self.max, 0, wxALIGN_LEFT|wxALL, 5 )
grid.AddWindow( self.limit_target, 0, wxALIGN_LEFT|wxALL, 5 )
grid.AddSpacer( 20, 0, 0, wxALIGN_LEFT|wxALL, 5 )
grid.AddSpacer( (20, 0), 0, wxALIGN_LEFT|wxALL, 5 )
grid.AddWindow( self.allow_none, 0, wxALIGN_LEFT|wxALL, 5 )
grid.AddSpacer( 20, 0, 0, wxALIGN_LEFT|wxALL, 5 )
grid.AddSpacer( (20, 0), 0, wxALIGN_LEFT|wxALL, 5 )
grid.AddWindow( self.allow_long, 0, wxALIGN_LEFT|wxALL, 5 )
grid.AddSpacer( 20, 0, 0, wxALIGN_LEFT|wxALL, 5 )
grid.AddSpacer( (20, 0), 0, wxALIGN_LEFT|wxALL, 5 )
grid.AddSpacer( 20, 0, 0, wxALIGN_LEFT|wxALL, 5 )
grid.AddSpacer( 20, 0, 0, wxALIGN_LEFT|wxALL, 5 )
grid.AddSpacer( (20, 0), 0, wxALIGN_LEFT|wxALL, 5 )
grid.AddSpacer( (20, 0), 0, wxALIGN_LEFT|wxALL, 5 )
grid.AddWindow( label, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5 )
grid.AddWindow( self.target_ctl, 0, wxALIGN_LEFT|wxALL, 5 )

22
wxPython/demo/wxMask.py
View File

@@ -65,17 +65,17 @@ class TestMaskWindow(wxScrolledWindow):
# make an interesting background...
dc.SetPen(wxMEDIUM_GREY_PEN)
for i in range(100):
dc.DrawLine(0,i*10,i*10,0)
dc.DrawLine((0,i*10), (i*10,0))
# draw raw image, mask, and masked images
dc.DrawText('original image', 0,0)
dc.DrawBitmap(self.bmp_nomask, 0,20, 0)
dc.DrawText('with colour mask', 0,100)
dc.DrawBitmap(self.bmp_withcolourmask, 0,120, 1)
dc.DrawText('the mask image', 0,200)
dc.DrawBitmap(self.bmp_themask, 0,220, 0)
dc.DrawText('masked image', 0,300)
dc.DrawBitmap(self.bmp_withmask, 0,320, 1)
dc.DrawText('original image', (0,0))
dc.DrawBitmap(self.bmp_nomask, (0,20), 0)
dc.DrawText('with colour mask', (0,100))
dc.DrawBitmap(self.bmp_withcolourmask, (0,120), 1)
dc.DrawText('the mask image', (0,200))
dc.DrawBitmap(self.bmp_themask, (0,220), 0)
dc.DrawText('masked image', (0,300))
dc.DrawBitmap(self.bmp_withmask, (0,320), 1)
cx,cy = self.bmp_themask.GetWidth(), self.bmp_themask.GetHeight()
@@ -84,9 +84,9 @@ class TestMaskWindow(wxScrolledWindow):
i = 0
for text, code in logicList:
x,y = 120+150*(i%4), 20+100*(i/4)
dc.DrawText(text, x, y-20)
dc.DrawText(text, (x, y-20))
mdc.SelectObject(self.bmp_withcolourmask)
dc.Blit(x,y, cx,cy, mdc, 0,0, code, True)
dc.Blit((x,y), (cx,cy), mdc, (0,0), code, True)
i = i + 1

10
wxPython/demo/wxScrolledPanel.py
View File

@@ -23,7 +23,7 @@ class TestPanel(wxScrolledPanel):
desc.SetForegroundColour("Blue")
vbox.Add(desc, 0, wxALIGN_LEFT|wxALL, 5)
vbox.Add(wxStaticLine(self, -1, size=(1024,-1)), 0, wxALL, 5)
vbox.AddSpacer(20,20)
vbox.Add((20,20))
words = text.split()
@@ -71,16 +71,16 @@ class TestPanel(wxScrolledPanel):
panel3.SetupScrolling()
hbox = wxBoxSizer(wxHORIZONTAL)
hbox.AddSpacer(20,20)
hbox.Add((20,20))
hbox.Add(panel1, 0)
hbox.AddSpacer(40, 10)
hbox.Add((40, 10))
vbox2 = wxBoxSizer(wxVERTICAL)
vbox2.Add(panel2, 0)
vbox2.AddSpacer(20, 50)
vbox2.Add((20, 50))
vbox2.Add(panel3, 0)
vbox2.AddSpacer(20, 10)
vbox2.Add((20, 10))
hbox.Add(vbox2)
vbox.AddSizer(hbox, 0)

12
wxPython/demo/wxTimeCtrl.py
View File

@@ -81,8 +81,8 @@ class TestPanel( wxScrolledPanel ):
self.target_ctrl = wxTimeCtrl( self, -1, name="new" )
grid2 = wxFlexGridSizer( 0, 2, 0, 0 )
grid2.Add( 20, 0, 0, wxALIGN_LEFT|wxALL, 5 )
grid2.Add( 20, 0, 0, wxALIGN_LEFT|wxALL, 5 )
grid2.Add( (20, 0), 0, wxALIGN_LEFT|wxALL, 5 )
grid2.Add( (20, 0), 0, wxALIGN_LEFT|wxALL, 5 )
grid2.Add( self.set_bounds, 0, wxALIGN_LEFT|wxALL, 5 )
grid3 = wxFlexGridSizer( 0, 2, 5, 5 )
@@ -93,16 +93,16 @@ class TestPanel( wxScrolledPanel ):
grid2.Add(grid3, 0, wxALIGN_LEFT )
grid2.Add( self.limit_check, 0, wxALIGN_LEFT|wxALL, 5 )
grid2.Add( 20, 0, 0, wxALIGN_LEFT|wxALL, 5 )
grid2.Add( (20, 0), 0, wxALIGN_LEFT|wxALL, 5 )
grid2.Add( 20, 0, 0, wxALIGN_LEFT|wxALL, 5 )
grid2.Add( 20, 0, 0, wxALIGN_LEFT|wxALL, 5 )
grid2.Add( (20, 0), 0, wxALIGN_LEFT|wxALL, 5 )
grid2.Add( (20, 0), 0, wxALIGN_LEFT|wxALL, 5 )
grid2.Add( label, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5 )
grid2.Add( self.target_ctrl, 0, wxALIGN_LEFT|wxALL, 5 )
boundsbox.Add(grid2, 0, wxALIGN_CENTER|wxEXPAND|wxALL, 5)
vbox = wxBoxSizer( wxVERTICAL )
vbox.AddSpacer(20, 20)
vbox.Add( (20, 20) )
vbox.Add( hbox, 0, wxALIGN_LEFT|wxALL, 5)
vbox.Add( boundsbox, 0, wxALIGN_LEFT|wxALL, 5 )