Changeset e6d9703 in sasview

Timestamp:

Apr 4, 2014 10:39:26 AM (10 years ago)

Author:

Mathieu Doucet <doucetm@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

6c00702

Parents:

77c13028

Message:

Re #212 Fix another tool bar

File:

• src/sans/perspectives/calculator/gen_scatter_panel.py (modified) (1 diff)

src/sans/perspectives/calculator/gen_scatter_panel.py

@@ -1831 +1831 @@
         """
         tsize = (20, 20)
-        tb = self.CreateToolBar(wx.TB_HORIZONTAL | wx.TB_FLAT)
+        # The legacy code doesn't work well for wx 3.0
+        # but the old code produces better results with wx 2.8
+        if wx.VERSION_STRING >= '3.0.0.0':
+            tb = wx.ToolBar(self, style=wx.TB_HORIZONTAL | wx.TB_FLAT)
+            sizer = wx.BoxSizer(wx.VERTICAL)
+            sizer.Add(tb, 0, wx.EXPAND)
+            self.SetSizer(sizer)
+        else:
+            tb = self.CreateToolBar(wx.TB_HORIZONTAL | wx.TB_FLAT)
         open_bmp = wx.ArtProvider.GetBitmap(wx.ART_FILE_OPEN, wx.ART_TOOLBAR, 
                                             tsize)