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

wx* and other name fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25038 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-12-30 01:06:02 +00:00
parent d2638b42a8
commit 3cfc1d6668
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wxPython/demo/MaskedEditControls.py
View File

@@ -174,7 +174,7 @@ class demoPage2(scroll.ScrolledPanel, demoMixin):
label = wx.StaticText( self, -1, """\ label = wx.StaticText( self, -1, """\
All these controls have been created by passing a single parameter, the autoformat code, All these controls have been created by passing a single parameter, the autoformat code,
and use the factory class wxMaskedCtrl with its default controlType. and use the factory class MaskedCtrl with its default controlType.
The maskededit module contains an internal dictionary of types and formats (autoformats). The maskededit module contains an internal dictionary of types and formats (autoformats).
Many of these already do complicated validation; To see some examples, try Many of these already do complicated validation; To see some examples, try
29 Feb 2002 vs. 2004 for the date formats, or email address validation. 29 Feb 2002 vs. 2004 for the date formats, or email address validation.
@@ -199,7 +199,7 @@ Many of these already do complicated validation; To see some examples, try
for autoformat, desc in med.autoformats: for autoformat, desc in med.autoformats:
grid.Add( wx.StaticText( self, -1, desc), 0, wx.ALIGN_LEFT ) grid.Add( wx.StaticText( self, -1, desc), 0, wx.ALIGN_LEFT )
grid.Add( wx.StaticText( self, -1, autoformat), 0, wx.ALIGN_LEFT ) grid.Add( wx.StaticText( self, -1, autoformat), 0, wx.ALIGN_LEFT )
grid.Add( mctl.wxMaskedCtrl( self, -1, "", grid.Add( mctl.MaskedCtrl( self, -1, "",
autoformat = autoformat, autoformat = autoformat,
demo = True, demo = True,
name = autoformat), name = autoformat),
@@ -375,7 +375,7 @@ A state name selector,
with auto-select:""") with auto-select:""")
# Create this one using factory function: # Create this one using factory function:
statename = mctl.wxMaskedCtrl( self, -1, med.state_names[0], statename = mctl.MaskedCtrl( self, -1, med.state_names[0],
controlType = mctl.controlTypes.MASKEDCOMBO, controlType = mctl.controlTypes.MASKEDCOMBO,
choices = med.state_names, choices = med.state_names,
autoformat="USSTATENAME", autoformat="USSTATENAME",
@@ -399,7 +399,7 @@ A masked ComboBox for fraction selection.
Choices for each side of the fraction can Choices for each side of the fraction can
be selected with PageUp/Down:""") be selected with PageUp/Down:""")
fraction = mctl.wxMaskedCtrl( self, -1, "", fraction = mctl.MaskedCtrl( self, -1, "",
controlType = mctl.MASKEDCOMBO, controlType = mctl.MASKEDCOMBO,
choices = choices, choices = choices,
choiceRequired = True, choiceRequired = True,
@@ -424,7 +424,7 @@ text from a list of numeric codes:""")
Programmatically set Programmatically set
choice sets:""") choice sets:""")
self.list_selector = wx.ComboBox(self, -1, '', choices = ['list1', 'list2', 'list3']) self.list_selector = wx.ComboBox(self, -1, '', choices = ['list1', 'list2', 'list3'])
self.dynamicbox = mctl.wxMaskedCtrl( self, -1, ' ', self.dynamicbox = mctl.MaskedCtrl( self, -1, ' ',
controlType = mctl.controlTypes.MASKEDCOMBO, controlType = mctl.controlTypes.MASKEDCOMBO,
mask = 'XXXX', mask = 'XXXX',
formatcodes = 'F_', formatcodes = 'F_',
@@ -452,7 +452,7 @@ Here are some examples of IpAddrCtrl, a control derived from MaskedTextCtrl:""")
label_ipaddr3 = wx.StaticText( self, -1, """\ label_ipaddr3 = wx.StaticText( self, -1, """\
A control with restricted legal values: A control with restricted legal values:
10. (1|2) . (129..255) . (0..255)""") 10. (1|2) . (129..255) . (0..255)""")
ipaddr3 = mctl.wxMaskedCtrl( self, -1, ipaddr3 = mctl.MaskedCtrl( self, -1,
controlType = mctl.controlTypes.IPADDR, controlType = mctl.controlTypes.IPADDR,
mask=" 10. #.###.###") mask=" 10. #.###.###")
ipaddr3.SetFieldParameters(0, validRegex="1|2",validRequired=False ) # requires entry to match or not allowed ipaddr3.SetFieldParameters(0, validRegex="1|2",validRequired=False ) # requires entry to match or not allowed

2
wxPython/demo/wxMDIWindows.py
View File

@@ -19,7 +19,7 @@ class TestPanel(wx.Panel):
self.Bind(wx.EVT_BUTTON, self.ShowMDIDemo, b1) self.Bind(wx.EVT_BUTTON, self.ShowMDIDemo, b1)
b2 = wx.Button(self, -1, "MDI with SashWindows demo") b2 = wx.Button(self, -1, "MDI with SashWindows demo")
self.Bind(wx.EVT_BUTTON, self.ShowMDIDemo, b2) self.Bind(wx.EVT_BUTTON, self.ShowMDISashDemo, b2)
box = wx.BoxSizer(wx.VERTICAL) box = wx.BoxSizer(wx.VERTICAL)
box.Add((20, 30)) box.Add((20, 30))