浏览代码

wxGUI: macOS use default output font dialog (#760)

default font dialog works from at least wxPython 4.0.6
nilason 4 年之前
父节点
当前提交
bc417cd16d
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      gui/wxpython/gui_core/preferences.py

+ 2 - 2
gui/wxpython/gui_core/preferences.py

@@ -47,7 +47,7 @@ from core import globalvar
 from core.gcmd import RunCommand, GError
 from core.gcmd import RunCommand, GError
 from core.utils import ListOfMapsets, GetColorTables, ReadEpsgCodes
 from core.utils import ListOfMapsets, GetColorTables, ReadEpsgCodes
 from core.settings import UserSettings
 from core.settings import UserSettings
-from core.globalvar import wxPythonPhoenix
+from core.globalvar import wxPythonPhoenix, CheckWxVersion
 from gui_core.dialogs import SymbolDialog, DefaultFontDialog
 from gui_core.dialogs import SymbolDialog, DefaultFontDialog
 from gui_core.widgets import IntegerValidator, ColorTablesComboBox
 from gui_core.widgets import IntegerValidator, ColorTablesComboBox
 from core.debug import Debug
 from core.debug import Debug
@@ -758,7 +758,7 @@ class PreferencesDialog(PreferencesBaseDialog):
         panel.SetSizer(border)
         panel.SetSizer(border)
 
 
         # bindings
         # bindings
-        if sys.platform == 'darwin':
+        if sys.platform == 'darwin' and not CheckWxVersion([4, 0, 6]):
             outfontButton.Bind(wx.EVT_BUTTON, self.OnSetOutputFontCustomDialog)
             outfontButton.Bind(wx.EVT_BUTTON, self.OnSetOutputFontCustomDialog)
         else:
         else:
             outfontButton.Bind(wx.EVT_BUTTON, self.OnSetOutputFont)
             outfontButton.Bind(wx.EVT_BUTTON, self.OnSetOutputFont)