[GRASS-SVN] r74223 - in grass/trunk/gui/wxpython: animation gui_core

svn_grass at osgeo.org svn_grass at osgeo.org
Mon Mar 11 18:38:52 PDT 2019


Author: annakrat
Date: 2019-03-11 18:38:51 -0700 (Mon, 11 Mar 2019)
New Revision: 74223

Modified:
   grass/trunk/gui/wxpython/animation/dialogs.py
   grass/trunk/gui/wxpython/gui_core/dialogs.py
Log:
wxGUI: fix #3780

Modified: grass/trunk/gui/wxpython/animation/dialogs.py
===================================================================
--- grass/trunk/gui/wxpython/animation/dialogs.py	2019-03-11 23:17:14 UTC (rev 74222)
+++ grass/trunk/gui/wxpython/animation/dialogs.py	2019-03-12 01:38:51 UTC (rev 74223)
@@ -29,6 +29,10 @@
 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 @@
         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#"

Modified: grass/trunk/gui/wxpython/gui_core/dialogs.py
===================================================================
--- grass/trunk/gui/wxpython/gui_core/dialogs.py	2019-03-11 23:17:14 UTC (rev 74222)
+++ grass/trunk/gui/wxpython/gui_core/dialogs.py	2019-03-12 01:38:51 UTC (rev 74223)
@@ -35,6 +35,11 @@
 
 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 @@
             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(



More information about the grass-commit mailing list