Python 3 and wxPython 4 fixes

Python 3 and wxPython 4 fixes

Author: jwdj

easy_abc.py

@@ -109,13 +109,11 @@ def unicode(s):
 from wx import GetTranslation as _
 from wxhelper import *
 # from midiplayer import *
-from fluidsynthplayer import *
-fluidsynth_available = False
 try:
     from fluidsynthplayer import *
     fluidsynth_available = True
-except:
-    pass
+except ImportError:
+    fluidsynth_available = False
 
 from wxmediaplayer import *
 from xml2abc_interface import xml_to_abc, abc_to_xml
@@ -4427,7 +4425,6 @@ def show_toolbar_panel(self, panel, visible):
 
     def setup_toolbar(self):
         self.toolbar = aui.AuiToolBar(self, -1, wx.DefaultPosition, wx.DefaultSize)#, agwStyle=aui.AUI_TB_DEFAULT_STYLE | aui.AUI_TB_OVERFLOW)
-        self.toolbar.SetToolAlignment(wx.ALIGN_CENTER_VERTICAL)
         try:
             self.toolbar.SetAGWWindowStyleFlag(aui.AUI_TB_PLAIN_BACKGROUND)
         except:
@@ -6229,7 +6226,7 @@ def scroll_music_pane(self, x, y):
         if (sx, sy) != orig_scroll:
             #print 'scroll', sx, sy
             ux, uy = self.music_pane.GetScrollPixelsPerUnit()
-            self.music_pane.Scroll(sx/ux, sy/uy)
+            self.music_pane.Scroll(int(sx/ux), int(sy/uy))
 
     def OnMovedToDifferentLine(self, queue_number_movement):
         if self.queue_number_movement != queue_number_movement:

music_score_panel.py

@@ -282,17 +282,17 @@ def Draw(self):
         if not WX4:
             dc.BeginDrawing()
         try:
-            try:
-                dc.SetBackground(wx.WHITE_BRUSH)
-                dc.Clear()
-                self.draw_drag_rect(dc)
-                if self.current_page != self.renderer.empty_page:
-                    self.renderer.draw(page=self.current_page, clear_background=False, dc=dc)
-            finally:
-                if not WX4:
-                    dc.EndDrawing()
+            dc.SetBackground(wx.WHITE_BRUSH)
+            dc.Clear()
+            self.draw_drag_rect(dc)
+            if self.current_page != self.renderer.empty_page:
+                self.renderer.draw(page=self.current_page, clear_background=False, dc=dc)
         except Exception as e:
             error_msg = ''.join(traceback.format_exception(sys.exc_info()[0], sys.exc_info()[1], sys.exc_info()[2]))
-            # print('Warning: %s' % error_msg)
+            print('Warning: ' + error_msg)
+        finally:
+            if not WX4:
+                dc.EndDrawing()
+
 
 

oldbin/readme.txt

@@ -0,0 +1,3 @@
+Place the binaries (executables) for the programs abcm2ps, abc2midi, midi2abc,
+abc2abc and nwc2xml here.  EasyABC will find them without the need
+for any configuration by the user. Also see note.txt.

svgrenderer.py

@@ -32,6 +32,7 @@
 from wxhelper import wx_colour, wx_bitmap
 import sys
 PY3 = sys.version_info.major > 2
+WX4 = wx.version().startswith('4')
 
 # 1.3.6.2 [JWdJ] 2015-02-12 tags evaluated only once
 svg_namespace = 'http://www.w3.org/2000/svg'
@@ -307,7 +308,7 @@ def __init__(self, can_draw_sharps_and_flats):
         self.empty_page = SvgPage(self, None)
         self.buffer = None
         # 1.3.6.2 [JWdJ] 2015-02-12 Added voicecolor
-        self.highlight_color = '#ee0000'
+        self.highlight_color = '#00cc00'  # '#ee0000'
         self.default_transform = None
         #self.update_buffer(self.empty_page)
         if wx.Platform == "__WXMAC__":
@@ -592,22 +593,42 @@ def set_stroke(self, dc, svg_stroke, line_width=1.0, linecap='butt', dasharray=N
         pen = self.stroke_cache.get(key)
         if pen is None:
             if svg_stroke == 'none':
-                pen = self.renderer.CreatePen(wx.NullPen)
+                if WX4:
+                    pen = self.renderer.CreatePen(wx.GraphicsPenInfo())
+                else:
+                    pen = self.renderer.CreatePen(wx.NullPen)
             else:
-                wxpen = wx.Pen(wx_colour(svg_stroke), line_width)
-                if linecap == 'butt':
-                    wxpen.SetCap(wx.CAP_BUTT)
-                elif linecap == 'round':
-                    wxpen.SetCap(wx.CAP_ROUND)
+                if WX4:
+                    wxpen = wx.GraphicsPenInfo(wx_colour(svg_stroke)).Width(line_width)
+                    if linecap == 'butt':
+                        wxpen.Cap(wx.CAP_BUTT)
+                    elif linecap == 'round':
+                        wxpen.Cap(wx.CAP_ROUND)
+                    else:
+                        raise Exception('linecap %s not supported yet' % linecap)
+                    # if dasharray:
+                    #     # 1.3.6.3 [JWDJ] 2015-3 dasharray is always a tuple, never a str or unicode
+                    #     #if type(dasharray) in (str, unicode):
+                    #     #    dasharray = [int(x.strip()) for x in dasharray.split(',')]
+                    #     wxpen.Dashes(list(dasharray))
+                    #     wxpen.Style(wx.USER_DASH)
+                    wxpen.Join(wx.JOIN_MITER)
                 else:
-                    raise Exception('linecap %s not supported yet' % linecap)
-                if dasharray:
-                    # 1.3.6.3 [JWDJ] 2015-3 dasharray is always a tuple, never a str or unicode
-                    #if type(dasharray) in (str, unicode):
-                    #    dasharray = [int(x.strip()) for x in dasharray.split(',')]
-                    wxpen.SetDashes(list(dasharray))
-                    wxpen.SetStyle(wx.USER_DASH)
-                wxpen.SetJoin(wx.JOIN_MITER)
+                    wxpen = wx.Pen(wx_colour(svg_stroke), line_width)
+                    if linecap == 'butt':
+                        wxpen.SetCap(wx.CAP_BUTT)
+                    elif linecap == 'round':
+                        wxpen.SetCap(wx.CAP_ROUND)
+                    else:
+                        raise Exception('linecap %s not supported yet' % linecap)
+                    if dasharray:
+                        # 1.3.6.3 [JWDJ] 2015-3 dasharray is always a tuple, never a str or unicode
+                        #if type(dasharray) in (str, unicode):
+                        #    dasharray = [int(x.strip()) for x in dasharray.split(',')]
+                        wxpen.SetDashes(list(dasharray))
+                        wxpen.SetStyle(wx.USER_DASH)
+                    wxpen.SetJoin(wx.JOIN_MITER)
+
                 pen = self.renderer.CreatePen(wxpen)
             self.stroke_cache[key] = pen
         dc.SetPen(pen)
@@ -752,7 +773,7 @@ def draw_svg_element(self, page, dc, svg_element, highlight, current_color):
             ##print repr(text), font_face, attr.get('font-size'), attr.get('font-weight')
             wxfont = wx.Font(font_size, font_family, style, weight, False, font_face, wx.FONTENCODING_DEFAULT)
             if wx.VERSION >= (3, 0) or '__WXMSW__' in wx.PlatformInfo:
-                wxfont.SetPixelSize((font_size, font_size))
+                wxfont.SetPixelSize(wx.Size(0, font_size))
                 y += 1
             else:
                 wxfont.SetPointSize(font_size)