Merge branch 'cbuttonwinfix'

printrun/gui.py

@@ -497,6 +497,8 @@ class MainWindow(wx.Frame):
         self.Bind(wx.EVT_CLOSE, self.kill)
 
         # Custom buttons
+        if wx.VERSION > (2, 9): self.centersizer = wx.WrapSizer(wx.HORIZONTAL)
+        else: self.centersizer = wx.GridBagSizer()
         self.centersizer = wx.GridBagSizer()
         self.centerpanel = self.newPanel(page1panel2)
         self.centerpanel.SetSizer(self.centersizer)
@@ -546,7 +548,8 @@ class MainWindow(wx.Frame):
             logpanel = self.newPanel(lowerpanel)
         viz_pane = VizPane(self, vizpanel)
         # Custom buttons
-        self.centersizer = wx.GridBagSizer()
+        if wx.VERSION > (2, 9): self.centersizer = wx.WrapSizer(wx.HORIZONTAL)
+        else: self.centersizer = wx.GridBagSizer()
         self.centerpanel = self.newPanel(vizpanel)
         self.centerpanel.SetSizer(self.centersizer)
         viz_pane.Add(self.centerpanel, 0, flag = wx.ALIGN_CENTER)

printrun/pronterface.py

@@ -875,15 +875,7 @@ Printrun. If not, see <http://www.gnu.org/licenses/>."""
         self.custombuttonbuttons = []
         custombuttons = self.custombuttons[:] + [None]
         for i, btndef in enumerate(custombuttons):
-            try:
-                b = wx.Button(self.centerpanel, -1, btndef.label, style = wx.BU_EXACTFIT)
-                b.SetToolTip(wx.ToolTip(_("Execute command: ") + btndef.command))
-                if btndef.background:
-                    b.SetBackgroundColour(btndef.background)
-                    rr, gg, bb = b.GetBackgroundColour().Get()
-                    if 0.3 * rr + 0.59 * gg + 0.11 * bb < 60:
-                        b.SetForegroundColour("#ffffff")
-            except:
+            if btndef is None:
                 if i == len(custombuttons) - 1:
                     self.newbuttonbutton = b = wx.Button(self.centerpanel, -1, "+", size = (19, 18), style = wx.BU_EXACTFIT)
                     #b.SetFont(wx.Font(12, wx.FONTFAMILY_SWISS, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD))
@@ -891,18 +883,26 @@ Printrun. If not, see <http://www.gnu.org/licenses/>."""
                     b.SetToolTip(wx.ToolTip(_("click to add new custom button")))
                     b.Bind(wx.EVT_BUTTON, self.cbutton_edit)
                 else:
-                    b = wx.Button(self.centerpanel, -1, ".", size = (1, 1))
-                    #b = wx.StaticText(self.panel,-1, "", size = (72, 22), style = wx.ALIGN_CENTRE+wx.ST_NO_AUTORESIZE) #+wx.SIMPLE_BORDER
-                    b.Disable()
-                    #continue
-            b.custombutton = i
-            b.properties = btndef
+                    b = wx.StaticText(self.panel, -1, "")
+            else:
+                b = wx.Button(self.centerpanel, -1, btndef.label, style = wx.BU_EXACTFIT)
+                b.SetToolTip(wx.ToolTip(_("Execute command: ") + btndef.command))
+                if btndef.background:
+                    b.SetBackgroundColour(btndef.background)
+                    rr, gg, bb = b.GetBackgroundColour().Get()
+                    if 0.3 * rr + 0.59 * gg + 0.11 * bb < 60:
+                        b.SetForegroundColour("#ffffff")
+                b.custombutton = i
+                b.properties = btndef
             if btndef is not None:
                 b.Bind(wx.EVT_BUTTON, self.procbutton)
                 b.Bind(wx.EVT_MOUSE_EVENTS, self.editbutton)
             self.custombuttonbuttons.append(b)
-            self.centersizer.Add(b, pos = (i // 4, i % 4))
-        self.panel.GetSizer().Layout()
+            if type(self.centersizer) == wx.GridBagSizer:
+                self.centersizer.Add(b, pos = (i // 4, i % 4), flag = wx.EXPAND)
+            else:
+                self.centersizer.Add(b, flag = wx.EXPAND)
+        self.Fit()
 
     def help_button(self):
         print _('Defines custom button. Usage: button <num> "title" [/c "colour"] command')