Download as
Browse Code »

Commit 52b8819f67a30add3069f0befa46b2040ae70219

Authored by Paulo Henrique Junqueira Amorim
1 parent 00952d8a
Exists in master and in 67 other branches 3d_inter_style, MIPs, beta3, beta4, brush_pix, canvas_reeng, canvas_text, casmoothing_cython, clean, command-line, cython_threshold, debian_cython, editor_improvements, encoding, ff_mask, ff_mask_improv, ffill_gui, ffill_segmentation, fill_holes_auto, fixes_pre_beta5, floodfill, get_pixel, import_mesh, interactor_style, inv3.0.1, mactoolbar, mactoolbar_bkp, manual_v3.1, mask_boolean_op, mask_boolean_op_bkp, mask_copy, mask_greatest_component, measure, measure_canvas, measure_improvements, measure_placement_test, measure_spacing, orientation, phoenix, region_growing_confidence, remote, remove_local_wxpython, rmatsuda-fix_ref_MTC, rmatsuda-fix_remove_marker_bug, rmatsuda-trigger_bug_fix, rotvol, segmentation_menu, select_part, smoothing_bin, smoothing_bin_pll, surface_area, threshold_history, user_guide_en, usp-navegador, vti, vtk6, watershed, watershed_improvements, watershed_improvements_bkp, watershed_merge, workdir, wwwlgui, wx2.9_mac, wxgtk3, wxgtk3_b5, wxgtk3_bkp, xmartlabs-command-line

FIX: Fixed incompatibility version from wxPython with agwStyle

Showing 1 changed file with 8 additions and 2 deletions   Show diff stats
invesalius/gui/preferences.py
  Diff comments   View file @52b8819
@@ -8,9 +8,10 @@ ID = wx.NewId() @@ -8,9 +8,10 @@ ID = wx.NewId()
8 8
9 try: 9 try:
10 from agw import flatnotebook as fnb 10 from agw import flatnotebook as fnb
  11 + AGW = 1
11 except ImportError: # if it's not there locally, try the wxPython lib. 12 except ImportError: # if it's not there locally, try the wxPython lib.
12 import wx.lib.agw.flatnotebook as fnb 13 import wx.lib.agw.flatnotebook as fnb
13 - 14 + AGW = 0
14 15
15 class Preferences(wx.Dialog): 16 class Preferences(wx.Dialog):
16 17
@@ -26,7 +27,12 @@ class Preferences(wx.Dialog): @@ -26,7 +27,12 @@ class Preferences(wx.Dialog):
26 sizer = wx.BoxSizer(wx.VERTICAL) 27 sizer = wx.BoxSizer(wx.VERTICAL)
27 28
28 bookStyle = fnb.FNB_NODRAG | fnb.FNB_NO_NAV_BUTTONS | fnb.FNB_NO_X_BUTTON 29 bookStyle = fnb.FNB_NODRAG | fnb.FNB_NO_NAV_BUTTONS | fnb.FNB_NO_X_BUTTON
29 - self.book = fnb.FlatNotebook(self, wx.ID_ANY, agwStyle=bookStyle) 30 +
  31 + if AGW:
  32 + self.book = fnb.FlatNotebook(self, wx.ID_ANY, agwStyle=bookStyle)
  33 + else:
  34 + self.book = fnb.FlatNotebook(self, wx.ID_ANY, style=bookStyle)
  35 +
30 sizer.Add(self.book, 80, wx.EXPAND|wx.ALL) 36 sizer.Add(self.book, 80, wx.EXPAND|wx.ALL)
31 37
32 self.pnl_viewer3d = Viewer3D(self) 38 self.pnl_viewer3d = Viewer3D(self)