Browse Source

wxGUI: fix https://trac.osgeo.org/grass/ticket/3780

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@74223 15284696-431f-4ddb-bdfa-cd5b030d7da7
Anna Petrášová 6 years ago
parent
commit
d22fc3e9bd
2 changed files with 11 additions and 2 deletions
  1. 5 1
      gui/wxpython/animation/dialogs.py
  2. 6 1
      gui/wxpython/gui_core/dialogs.py

+ 5 - 1
gui/wxpython/animation/dialogs.py

@@ -29,6 +29,10 @@ import datetime
 import wx.lib.filebrowsebutton as filebrowse
 import wx.lib.scrolledpanel as SP
 import wx.lib.colourselect as csel
+try:
+    from wx.adv import HyperlinkCtrl
+except ImportError:
+    from wx import HyperlinkCtrl
 
 from core.gcmd import GMessage, GError, GException
 from core import globalvar
@@ -2013,7 +2017,7 @@ class PreferencesDialog(PreferencesBaseDialog):
         self._setTimeFormat(self.tempFormat.GetValue())
 
         row += 1
-        link = wx.HyperlinkCtrl(
+        link = HyperlinkCtrl(
             panel, id=wx.ID_ANY,
             label=_("Learn more about formatting options"),
             url="http://docs.python.org/2/library/datetime.html#"

+ 6 - 1
gui/wxpython/gui_core/dialogs.py

@@ -35,6 +35,11 @@ import six
 
 import wx
 
+try:
+    from wx.adv import HyperlinkCtrl
+except ImportError:
+    from wx import HyperlinkCtrl
+
 from grass.script import core as grass
 from grass.script.utils import natural_sort, try_remove
 
@@ -2308,7 +2313,7 @@ class HyperlinkDialog(wx.Dialog):
             flag=wx.ALIGN_CENTRE | wx.ALL,
             border=10)
         hyperlinkLabel = hyperlinkLabel if hyperlinkLabel else hyperlink
-        hyperlinkCtrl = wx.HyperlinkCtrl(
+        hyperlinkCtrl = HyperlinkCtrl(
             self, id=wx.ID_ANY, label=hyperlinkLabel, url=hyperlink,
             style=wx.HL_ALIGN_LEFT | wx.HL_CONTEXTMENU)
         sizer.Add(