diff --git a/wxPython/misc/widgetLayoutTest.cfg b/wxPython/misc/widgetLayoutTest.cfg index a0b4a1df42..dd73a07440 100644 --- a/wxPython/misc/widgetLayoutTest.cfg +++ b/wxPython/misc/widgetLayoutTest.cfg @@ -9,10 +9,10 @@ ['wx', 'CheckListBox', '-1, size=(100,-1), choices="one two three four five six seven eight".split()', ''], ['wx', 'Choice', '-1, choices="one two three four five six seven eight".split()', ''], ['wx', 'ComboBox', '-1, choices="one two three four five six seven eight".split(), value="default"', ''], -['wx', 'Gauge', '-1, 100', ''], -['wx', 'Gauge', '-1, 100, style=wx.GA_VERTICAL', ''], +['wx', 'Gauge', '-1, 100', 'w.SetValue(40)'], +['wx', 'Gauge', '-1, 100, style=wx.GA_VERTICAL', 'w.SetValue(60)'], ['wx', 'ListBox', '-1, choices="one two three four five six seven eight".split()', ''], -['wx', 'ListCtrl', '', ''], +['wx', 'ListCtrl', 'style=wx.LC_REPORT, size=(100,100)', 'w.InsertColumn(0, "Col1")\nw.InsertStringItem(0, "Item 0")\nw.InsertStringItem(0, "Item 1")\n#w.SetSizeHints((200,100))'], ['wx', 'Notebook', '', 'p = wx.Panel(w)\np.SetSizeHints((150,150))\nw.AddPage(p, "test")\n'], ['wx', 'Panel', 'size=(150,150)', ''], ['wx', 'RadioBox', '-1, "label", choices="one two three four five six seven eight".split(), majorDimension=2', ''], diff --git a/wxPython/misc/widgetLayoutTest.py b/wxPython/misc/widgetLayoutTest.py index 22706ac42f..7625d6d442 100644 --- a/wxPython/misc/widgetLayoutTest.py +++ b/wxPython/misc/widgetLayoutTest.py @@ -9,6 +9,10 @@ import wx import sys import os +# stuff for debugging +print "wx.VERSION_STRING = ", wx.VERSION_STRING +print "pid:", os.getpid() +#raw_input("Press Enter...") class LayoutTestFrame(wx.Frame): def __init__(self): @@ -310,20 +314,6 @@ class LayoutTestFrame(wx.Frame): self.infoPane.Update(w, testPanel) - if False: - print 'w size', w.GetSize() - print 'w minsize', w.GetMinSize() - print 'w bestsize', w.GetBestSize() - print 'w abstsize', w.GetAdjustedBestSize() - - tp = self.testPanel - #print tp.GetSizer() - print 'tp size', tp.GetSize() - print 'tp minsize', tp.GetMinSize() - print 'tp bestsize', tp.GetBestSize() - print 'tp abstsize', tp.GetAdjustedBestSize() - - def OnDestroyWidget(self, evt): self.testWidget.Destroy() @@ -342,7 +332,6 @@ class LayoutTestFrame(wx.Frame): self.infoPane.Clear() - def OnClear(self, evt): self.moduleName.SetValue("") self.className.SetValue("") @@ -490,6 +479,9 @@ class ColourInfoPanel(wx.Panel): self._fgtxt.SetValue( clr2hex(win.GetForegroundColour(), self._fgclr) ) self._bgtxt.SetValue( clr2hex(win.GetBackgroundColour(), self._bgclr) ) +## f = win.GetFont() +## print f.GetNativeFontInfo().ToString() + def Clear(self): self._fgtxt.SetValue("")