[GRASS-SVN] r59221 - in grass/trunk/gui/wxpython: . animation dbmgr gcp gmodeler gui_core iclass location_wizard mapdisp mapswipe psmap rlisetup vdigit
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Mar 10 06:33:58 PDT 2014
Author: annakrat
Date: 2014-03-10 06:33:57 -0700 (Mon, 10 Mar 2014)
New Revision: 59221
Modified:
grass/trunk/gui/wxpython/animation/dialogs.py
grass/trunk/gui/wxpython/animation/g.gui.animation.py
grass/trunk/gui/wxpython/dbmgr/g.gui.dbmgr.py
grass/trunk/gui/wxpython/gcp/g.gui.gcp.py
grass/trunk/gui/wxpython/gis_set_error.py
grass/trunk/gui/wxpython/gmodeler/g.gui.gmodeler.py
grass/trunk/gui/wxpython/gui_core/goutput.py
grass/trunk/gui/wxpython/gui_core/query.py
grass/trunk/gui/wxpython/gui_core/treeview.py
grass/trunk/gui/wxpython/iclass/frame.py
grass/trunk/gui/wxpython/iclass/g.gui.iclass.py
grass/trunk/gui/wxpython/location_wizard/dialogs.py
grass/trunk/gui/wxpython/mapdisp/test_mapdisp.py
grass/trunk/gui/wxpython/mapswipe/g.gui.mapswipe.py
grass/trunk/gui/wxpython/psmap/g.gui.psmap.py
grass/trunk/gui/wxpython/rlisetup/g.gui.rlisetup.py
grass/trunk/gui/wxpython/vdigit/g.gui.vdigit.py
Log:
wxGUI: use wx.App instead of wx.PySimpleApp to avoid deprecation warning in wxPython 3
Modified: grass/trunk/gui/wxpython/animation/dialogs.py
===================================================================
--- grass/trunk/gui/wxpython/animation/dialogs.py 2014-03-09 23:24:01 UTC (rev 59220)
+++ grass/trunk/gui/wxpython/animation/dialogs.py 2014-03-10 13:33:57 UTC (rev 59221)
@@ -1586,7 +1586,7 @@
def test():
import wx.lib.inspection
- app = wx.PySimpleApp()
+ app = wx.App()
# testTemporalLayer()
# testAnimLmgr()
Modified: grass/trunk/gui/wxpython/animation/g.gui.animation.py
===================================================================
--- grass/trunk/gui/wxpython/animation/g.gui.animation.py 2014-03-09 23:24:01 UTC (rev 59220)
+++ grass/trunk/gui/wxpython/animation/g.gui.animation.py 2014-03-10 13:33:57 UTC (rev 59221)
@@ -122,7 +122,7 @@
layer.cmd = ['d.vect', 'map=']
layerList.AddLayer(layer)
- app = wx.PySimpleApp()
+ app = wx.App()
if not CheckWxVersion([2, 9]):
wx.InitAllImageHandlers()
Modified: grass/trunk/gui/wxpython/dbmgr/g.gui.dbmgr.py
===================================================================
--- grass/trunk/gui/wxpython/dbmgr/g.gui.dbmgr.py 2014-03-09 23:24:01 UTC (rev 59220)
+++ grass/trunk/gui/wxpython/dbmgr/g.gui.dbmgr.py 2014-03-10 13:33:57 UTC (rev 59221)
@@ -48,7 +48,7 @@
grass.set_raise_on_error(False)
grass.fatal(_("Vector map <%s> not found") % options['map'])
- app = wx.PySimpleApp()
+ app = wx.App()
grass.message(_("Loading attribute data for vector map <%s>...") % mapName)
f = AttributeManager(parent = None, id = wx.ID_ANY,
title = "%s - <%s>" % (_("GRASS GIS Attribute Table Manager"),
Modified: grass/trunk/gui/wxpython/gcp/g.gui.gcp.py
===================================================================
--- grass/trunk/gui/wxpython/gcp/g.gui.gcp.py 2014-03-09 23:24:01 UTC (rev 59220)
+++ grass/trunk/gui/wxpython/gcp/g.gui.gcp.py 2014-03-10 13:33:57 UTC (rev 59221)
@@ -61,7 +61,7 @@
else:
os.environ['GRASS_RENDER_IMMEDIATE'] = 'cairo'
- app = wx.PySimpleApp()
+ app = wx.App()
if not CheckWxVersion([2, 9]):
wx.InitAllImageHandlers()
Modified: grass/trunk/gui/wxpython/gis_set_error.py
===================================================================
--- grass/trunk/gui/wxpython/gis_set_error.py 2014-03-09 23:24:01 UTC (rev 59220)
+++ grass/trunk/gui/wxpython/gis_set_error.py 2014-03-10 13:33:57 UTC (rev 59221)
@@ -18,7 +18,7 @@
import wx
def main():
- app = wx.PySimpleApp()
+ app = wx.App()
if len(sys.argv) == 1:
msg = "Unknown reason"
Modified: grass/trunk/gui/wxpython/gmodeler/g.gui.gmodeler.py
===================================================================
--- grass/trunk/gui/wxpython/gmodeler/g.gui.gmodeler.py 2014-03-09 23:24:01 UTC (rev 59220)
+++ grass/trunk/gui/wxpython/gmodeler/g.gui.gmodeler.py 2014-03-10 13:33:57 UTC (rev 59221)
@@ -51,7 +51,7 @@
from gmodeler.frame import ModelFrame
def main():
- app = wx.PySimpleApp()
+ app = wx.App()
if not CheckWxVersion([2, 9]):
wx.InitAllImageHandlers()
frame = ModelFrame(parent = None, giface = StandaloneGrassInterface())
Modified: grass/trunk/gui/wxpython/gui_core/goutput.py
===================================================================
--- grass/trunk/gui/wxpython/gui_core/goutput.py 2014-03-09 23:24:01 UTC (rev 59220)
+++ grass/trunk/gui/wxpython/gui_core/goutput.py 2014-03-10 13:33:57 UTC (rev 59221)
@@ -736,7 +736,7 @@
def testGConsole():
- app = wx.PySimpleApp()
+ app = wx.App()
frame = GConsoleFrame(parent = None)
frame.Show()
app.MainLoop()
Modified: grass/trunk/gui/wxpython/gui_core/query.py
===================================================================
--- grass/trunk/gui/wxpython/gui_core/query.py 2014-03-09 23:24:01 UTC (rev 59220)
+++ grass/trunk/gui/wxpython/gui_core/query.py 2014-03-10 13:33:57 UTC (rev 59221)
@@ -243,7 +243,7 @@
def test():
- app = wx.PySimpleApp()
+ app = wx.App()
from grass.script import vector as gvect
from grass.script import raster as grast
testdata1 = grast.raster_what(map = ('elevation_shade at PERMANENT','landclass96'),
Modified: grass/trunk/gui/wxpython/gui_core/treeview.py
===================================================================
--- grass/trunk/gui/wxpython/gui_core/treeview.py 2014-03-09 23:24:01 UTC (rev 59220)
+++ grass/trunk/gui/wxpython/gui_core/treeview.py 2014-03-10 13:33:57 UTC (rev 59221)
@@ -218,7 +218,7 @@
n111 = tree.AppendNode(parent=n11, label='node111', data={'xxx': 'A'}) # pylint: disable=W0612
- app = wx.PySimpleApp()
+ app = wx.App()
frame = TreeFrame(model=tree)
# frame.tree.Select(n111)
frame.Show()
Modified: grass/trunk/gui/wxpython/iclass/frame.py
===================================================================
--- grass/trunk/gui/wxpython/iclass/frame.py 2014-03-09 23:24:01 UTC (rev 59220)
+++ grass/trunk/gui/wxpython/iclass/frame.py 2014-03-10 13:33:57 UTC (rev 59221)
@@ -1343,7 +1343,7 @@
def test():
import core.render as render
- app = wx.PySimpleApp()
+ app = wx.App()
wx.InitAllImageHandlers()
frame = IClassMapFrame()
Modified: grass/trunk/gui/wxpython/iclass/g.gui.iclass.py
===================================================================
--- grass/trunk/gui/wxpython/iclass/g.gui.iclass.py 2014-03-09 23:24:01 UTC (rev 59220)
+++ grass/trunk/gui/wxpython/iclass/g.gui.iclass.py 2014-03-10 13:33:57 UTC (rev 59221)
@@ -98,7 +98,7 @@
os.environ['GRASS_RENDER_IMMEDIATE'] = 'cairo'
# launch application
- app = wx.PySimpleApp()
+ app = wx.App()
if not CheckWxVersion([2, 9]):
wx.InitAllImageHandlers()
Modified: grass/trunk/gui/wxpython/location_wizard/dialogs.py
===================================================================
--- grass/trunk/gui/wxpython/location_wizard/dialogs.py 2014-03-09 23:24:01 UTC (rev 59220)
+++ grass/trunk/gui/wxpython/location_wizard/dialogs.py 2014-03-10 13:33:57 UTC (rev 59221)
@@ -624,7 +624,7 @@
import wx.lib.inspection
import grass.script as grass
- app = wx.PySimpleApp()
+ app = wx.App()
dlg = RegionDef(None, location = grass.gisenv()["LOCATION_NAME"])
dlg.Show()
Modified: grass/trunk/gui/wxpython/mapdisp/test_mapdisp.py
===================================================================
--- grass/trunk/gui/wxpython/mapdisp/test_mapdisp.py 2014-03-09 23:24:01 UTC (rev 59220)
+++ grass/trunk/gui/wxpython/mapdisp/test_mapdisp.py 2014-03-10 13:33:57 UTC (rev 59221)
@@ -290,7 +290,7 @@
options, flags = grass.parser()
test = options['test']
- app = wx.PySimpleApp()
+ app = wx.App()
if not CheckWxVersion([2, 9]):
wx.InitAllImageHandlers()
Modified: grass/trunk/gui/wxpython/mapswipe/g.gui.mapswipe.py
===================================================================
--- grass/trunk/gui/wxpython/mapswipe/g.gui.mapswipe.py 2014-03-09 23:24:01 UTC (rev 59220)
+++ grass/trunk/gui/wxpython/mapswipe/g.gui.mapswipe.py 2014-03-10 13:33:57 UTC (rev 59221)
@@ -81,7 +81,7 @@
if not gfile['name']:
grass.fatal(_("Raster map <%s> not found") % mapName)
- app = wx.PySimpleApp()
+ app = wx.App()
if not CheckWxVersion([2, 9]):
wx.InitAllImageHandlers()
Modified: grass/trunk/gui/wxpython/psmap/g.gui.psmap.py
===================================================================
--- grass/trunk/gui/wxpython/psmap/g.gui.psmap.py 2014-03-09 23:24:01 UTC (rev 59220)
+++ grass/trunk/gui/wxpython/psmap/g.gui.psmap.py 2014-03-10 13:33:57 UTC (rev 59221)
@@ -49,7 +49,7 @@
from psmap.instructions import Instruction
def main():
- app = wx.PySimpleApp()
+ app = wx.App()
if not CheckWxVersion([2, 9]):
wx.InitAllImageHandlers()
frame = PsMapFrame(parent = None)
Modified: grass/trunk/gui/wxpython/rlisetup/g.gui.rlisetup.py
===================================================================
--- grass/trunk/gui/wxpython/rlisetup/g.gui.rlisetup.py 2014-03-09 23:24:01 UTC (rev 59220)
+++ grass/trunk/gui/wxpython/rlisetup/g.gui.rlisetup.py 2014-03-10 13:33:57 UTC (rev 59221)
@@ -43,7 +43,7 @@
def main():
- app = wx.PySimpleApp()
+ app = wx.App()
if not CheckWxVersion([2, 9]):
wx.InitAllImageHandlers()
frame = RLiSetupFrame(parent=None, giface=StandaloneGrassInterface())
Modified: grass/trunk/gui/wxpython/vdigit/g.gui.vdigit.py
===================================================================
--- grass/trunk/gui/wxpython/vdigit/g.gui.vdigit.py 2014-03-09 23:24:01 UTC (rev 59220)
+++ grass/trunk/gui/wxpython/vdigit/g.gui.vdigit.py 2014-03-10 13:33:57 UTC (rev 59221)
@@ -78,7 +78,7 @@
else:
os.environ['GRASS_RENDER_IMMEDIATE'] = 'cairo'
- app = wx.PySimpleApp()
+ app = wx.App()
if not CheckWxVersion([2, 9]):
wx.InitAllImageHandlers()
frame = VDigitMapFrame(options['map'])
More information about the grass-commit
mailing list