AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tweaks to work around wxMac bugs

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27130 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 2004-05-07 01:55:27 +00:00
parent f20a2e1f40
commit 0bdcd2f507
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wxPython/misc/widgetLayoutTest.cfg
View File

@ -1,7 +1,7 @@
[
['wx', 'BitmapButton', '-1, wx.Bitmap("image.png")', ''],
['wx', 'Button', '-1, "normal"', ''],
['wx', 'Button', '-1, "sized", size=(200,100)', ''],
['wx', 'Button', '-1, "default"', 'w.SetDefault()'],
['wx', 'Button', '-1, "with a longer, longer label"', ''],
['wx.calendar', 'CalendarCtrl', '-1', ''],
['wx', 'CheckBox', '-1, "checkbox"', ''],

21
wxPython/misc/widgetLayoutTest.py
View File

@ -76,6 +76,9 @@ class LayoutTestFrame(wx.Frame):
self.Bind(wx.EVT_LISTBOX, self.OnHistorySelect, self.testHistory)
self.Bind(wx.EVT_LISTBOX_DCLICK, self.OnHistoryActivate, self.testHistory)
if 'wxMac' in wx.PlatformInfo or 'wxGTK' in wx.PlatformInfo:
self.testHistory.Bind(wx.EVT_KEY_DOWN, self.OnHistoryKey)
# setup the layout
mainSizer = wx.BoxSizer(wx.VERTICAL)
@ -91,7 +94,7 @@ class LayoutTestFrame(wx.Frame):
mcSizer = wx.BoxSizer(wx.HORIZONTAL)
mcSizer.Add(self.moduleName, 0, 0)
mcSizer.Add(wx.StaticText(p, -1, "Class name:"),
0, wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL |wx.LEFT, 10)
0, wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL |wx.LEFT|wx.RIGHT, 10)
mcSizer.Add(self.className, 1, 0)
ctlsSizer.Add(mcSizer, 0, wx.EXPAND)
@ -217,13 +220,16 @@ class LayoutTestFrame(wx.Frame):
def OnHistorySelect(self, evt):
idx = self.testHistory.GetSelection()
#idx = self.testHistory.GetSelection()
idx = evt.GetInt()
if idx != wx.NOT_FOUND:
item = self.history[idx]
self.moduleName.SetValue(item[0])
self.className.SetValue(item[1])
self.parameters.SetValue(item[2])
self.postCreate.SetValue(item[3])
if 'wxMac' in wx.PlatformInfo:
self.OnUpdate(None)
def OnHistoryActivate(self, evt):
@ -233,6 +239,13 @@ class LayoutTestFrame(wx.Frame):
btn.Command(e)
def OnHistoryKey(self, evt):
key = evt.GetKeyCode()
if key == wx.WXK_RETURN:
self.OnHistoryActivate(None)
else:
evt.Skip()
def OnUpdate(self, evt):
# get the details from the form
@ -270,6 +283,8 @@ class LayoutTestFrame(wx.Frame):
parameters = self.parameters.GetValue()
expr = self.expression.GetValue()[4:]
postCreate = self.postCreate.GetValue()
if 'wxMac' in wx.PlatformInfo:
postCreate = postCreate.replace('\r', '\n')
# make sure the module is imported already
if not sys.modules.has_key(moduleName):
@ -494,7 +509,7 @@ class ColourInfoPanel(wx.Panel):
app = wx.PySimpleApp(redirect=True)
app = wx.PySimpleApp(redirect=False)
frame = LayoutTestFrame()
app.SetTopWindow(frame)
frame.Show()