[GRASS-SVN] r51955 - grass/branches/releasebranch_6_4/gui/wxpython/gui_core

[svn_grass at osgeo.org]

Author: martinl
Date: 2012-06-03 06:40:45 -0700 (Sun, 03 Jun 2012)
New Revision: 51955

Modified:
   grass/branches/releasebranch_6_4/gui/wxpython/gui_core/forms.py
Log:
wxGUI/forms: use ScrolledPanel from gui_core.widgets
            (merge r51953 from trunk)


Modified: grass/branches/releasebranch_6_4/gui/wxpython/gui_core/forms.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_core/forms.py	2012-06-03 13:36:01 UTC (rev 51954)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_core/forms.py	2012-06-03 13:40:45 UTC (rev 51955)
@@ -32,7 +32,7 @@
 @todo
  - verify option value types
 
-Copyright(C) 2000-2011 by the GRASS Development Team
+Copyright(C) 2000-2012 by the GRASS Development Team
 
 This program is free software under the GPL(>=v2) Read the file
 COPYING coming with GRASS for details.
@@ -73,7 +73,6 @@
     import wx.lib.flatnotebook as FN
 import wx.lib.colourselect     as csel
 import wx.lib.filebrowsebutton as filebrowse
-import wx.lib.scrolledpanel    as scrolled
 from wx.lib.newevent import NewEvent
 
 try:
@@ -84,7 +83,7 @@
 from grass.script import core as grass
 from grass.script import task as gtask
 
-from gui_core.widgets import StaticWrapText
+from gui_core.widgets import StaticWrapText, ScrolledPanel
 from gui_core.ghelp   import HelpPanel
 from gui_core         import gselect
 from core             import gcmd
@@ -771,7 +770,7 @@
         tab = {}
         tabsizer = {}
         for section in sections:
-            tab[section] = scrolled.ScrolledPanel(parent = self.notebook)
+            tab[section] = ScrolledPanel(parent = self.notebook)
             tab[section].SetScrollRate(10, 10)
             tabsizer[section] = wx.BoxSizer(orient = wx.VERTICAL)
             self.notebook.AddPage(page = tab[section], text = section)