q3k
/
Printrun
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use correct variable for uppersizer

master
Guillaume Seguin 2012-09-05 14:37:03 +02:00
parent 123fbf3802
commit 0d7a722839
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pronterface.py
View File

@ -837,8 +837,8 @@ class PronterWindow(MainWindow, pronsole.pronsole):
#self.newbuttonbutton.SetFont(wx.Font(10, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL)) #self.newbuttonbutton.SetFont(wx.Font(10, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL))
#self.newbuttonbutton.SetForegroundColour("black") #self.newbuttonbutton.SetForegroundColour("black")
#self.newbuttonbutton.SetSize(obj.GetSize()) #self.newbuttonbutton.SetSize(obj.GetSize())
#if self.upperbottomsizer.GetItem(self.newbuttonbutton) is not None: #if self.uppersizer.GetItem(self.newbuttonbutton) is not None:
# self.upperbottomsizer.SetItemMinSize(self.newbuttonbutton, obj.GetSize()) # self.uppersizer.SetItemMinSize(self.newbuttonbutton, obj.GetSize())
# self.mainsizer.Layout() # self.mainsizer.Layout()
for b in self.custombuttonbuttons: for b in self.custombuttonbuttons:
#if b.IsFrozen(): b.Thaw() #if b.IsFrozen(): b.Thaw()
@ -848,8 +848,8 @@ class PronterWindow(MainWindow, pronsole.pronsole):
b.SetFont(wx.Font(10, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL)) b.SetFont(wx.Font(10, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL))
b.SetForegroundColour("black") b.SetForegroundColour("black")
b.SetSize(obj.GetSize()) b.SetSize(obj.GetSize())
if self.upperbottomsizer.GetItem(b) is not None: if self.uppersizer.GetItem(b) is not None:
self.upperbottomsizer.SetItemMinSize(b, obj.GetSize()) self.uppersizer.SetItemMinSize(b, obj.GetSize())
self.mainsizer.Layout() self.mainsizer.Layout()
# b.SetStyle(wx.ALIGN_CENTRE+wx.ST_NO_AUTORESIZE+wx.SIMPLE_BORDER) # b.SetStyle(wx.ALIGN_CENTRE+wx.ST_NO_AUTORESIZE+wx.SIMPLE_BORDER)
self.dragging = wx.Button(self.panel,-1, obj.GetLabel(), style = wx.BU_EXACTFIT) self.dragging = wx.Button(self.panel,-1, obj.GetLabel(), style = wx.BU_EXACTFIT)
@ -877,9 +877,9 @@ class PronterWindow(MainWindow, pronsole.pronsole):
break break
#if dst is None and self.panel.GetScreenRect().Contains(scrpos): #if dst is None and self.panel.GetScreenRect().Contains(scrpos):
# # try to check if it is after buttons at the end # # try to check if it is after buttons at the end
# tspos = self.panel.ClientToScreen(self.upperbottomsizer.GetPosition()) # tspos = self.panel.ClientToScreen(self.uppersizer.GetPosition())
# bspos = self.panel.ClientToScreen(self.centersizer.GetPosition()) # bspos = self.panel.ClientToScreen(self.centersizer.GetPosition())
# tsrect = wx.Rect(*(tspos.Get()+self.upperbottomsizer.GetSize().Get())) # tsrect = wx.Rect(*(tspos.Get()+self.uppersizer.GetSize().Get()))
# bsrect = wx.Rect(*(bspos.Get()+self.centersizer.GetSize().Get())) # bsrect = wx.Rect(*(bspos.Get()+self.centersizer.GetSize().Get()))
# lbrect = btns[-1].GetScreenRect() # lbrect = btns[-1].GetScreenRect()
# p = scrpos.Get() # p = scrpos.Get()