mirror of
https://github.com/wxWidgets/Phoenix.git
synced 2026-01-05 03:20:08 +01:00
First pass at adding wxGrid and related classes. It all compiles, but there is still lots more to do.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
70
etg/_grid.py
Normal file
70
etg/_grid.py
Normal file
@@ -0,0 +1,70 @@
|
||||
#---------------------------------------------------------------------------
|
||||
# Name: etg/_grid.py
|
||||
# Author: Robin Dunn
|
||||
#
|
||||
# Created: 20-Dec-2012
|
||||
# Copyright: (c) 2013 by Total Control Software
|
||||
# License: wxWindows License
|
||||
#---------------------------------------------------------------------------
|
||||
|
||||
import etgtools
|
||||
import etgtools.tweaker_tools as tools
|
||||
|
||||
PACKAGE = "wx"
|
||||
MODULE = "_grid"
|
||||
NAME = "_grid" # Base name of the file to generate to for this script
|
||||
DOCSTRING = ""
|
||||
|
||||
# The classes and/or the basename of the Doxygen XML files to be processed by
|
||||
# this script.
|
||||
ITEMS = [ ]
|
||||
|
||||
|
||||
# The list of other ETG scripts and back-end generator modules that are
|
||||
# included as part of this module. These items are in their own etg scripts
|
||||
# for easier maintainability, but their class and function definitions are
|
||||
# intended to be part of this module, not their own module. This also makes it
|
||||
# easier to promote one of these to module status later if desired, simply
|
||||
# remove it from this list of Includes, and change the MODULE value in the
|
||||
# promoted script to be the same as its NAME.
|
||||
INCLUDES = [ 'grid',
|
||||
]
|
||||
|
||||
|
||||
# Separate the list into those that are generated from ETG scripts and the
|
||||
# rest. These lists can be used from setup.py for a list of sources and a list
|
||||
# of additional dependencies when building this extension module
|
||||
ETGFILES = ['etg/%s.py' % NAME] + tools.getEtgFiles(INCLUDES)
|
||||
DEPENDS = tools.getNonEtgFiles(INCLUDES)
|
||||
OTHERDEPS = []
|
||||
|
||||
|
||||
#---------------------------------------------------------------------------
|
||||
|
||||
def run():
|
||||
# Parse the XML file(s) building a collection of Extractor objects
|
||||
module = etgtools.ModuleDef(PACKAGE, MODULE, NAME, DOCSTRING, check4unittest=False)
|
||||
etgtools.parseDoxyXML(module, ITEMS)
|
||||
|
||||
#-----------------------------------------------------------------
|
||||
# Tweak the parsed meta objects in the module object as needed for
|
||||
# customizing the generated code and docstrings.
|
||||
|
||||
module.addHeaderCode('#include <wxpy_api.h>')
|
||||
module.addImport('_core')
|
||||
module.addPyCode("import wx", order=10)
|
||||
|
||||
module.addInclude(INCLUDES)
|
||||
|
||||
|
||||
#-----------------------------------------------------------------
|
||||
tools.doCommonTweaks(module)
|
||||
tools.runGenerators(module)
|
||||
|
||||
|
||||
|
||||
#---------------------------------------------------------------------------
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
run()
|
||||
232
etg/grid.py
Normal file
232
etg/grid.py
Normal file
@@ -0,0 +1,232 @@
|
||||
#---------------------------------------------------------------------------
|
||||
# Name: etg/grid.py
|
||||
# Author: Robin Dunn
|
||||
#
|
||||
# Created: 20-Dec-2012
|
||||
# Copyright: (c) 2013 by Total Control Software
|
||||
# License: wxWindows License
|
||||
#---------------------------------------------------------------------------
|
||||
|
||||
import etgtools
|
||||
import etgtools.tweaker_tools as tools
|
||||
|
||||
PACKAGE = "wx"
|
||||
MODULE = "_grid"
|
||||
NAME = "grid" # Base name of the file to generate to for this script
|
||||
DOCSTRING = ""
|
||||
|
||||
# The classes and/or the basename of the Doxygen XML files to be processed by
|
||||
# this script.
|
||||
ITEMS = [ 'wxGridCellCoords',
|
||||
|
||||
'wxGridCellRenderer',
|
||||
'wxGridCellAutoWrapStringRenderer',
|
||||
'wxGridCellBoolRenderer',
|
||||
'wxGridCellDateTimeRenderer',
|
||||
'wxGridCellEnumRenderer',
|
||||
'wxGridCellFloatRenderer',
|
||||
'wxGridCellNumberRenderer',
|
||||
'wxGridCellStringRenderer',
|
||||
|
||||
'wxGridCellEditor',
|
||||
'wxGridCellAutoWrapStringEditor',
|
||||
'wxGridCellBoolEditor',
|
||||
'wxGridCellChoiceEditor',
|
||||
'wxGridCellEnumEditor',
|
||||
'wxGridCellTextEditor',
|
||||
'wxGridCellFloatEditor',
|
||||
'wxGridCellNumberEditor',
|
||||
|
||||
'wxGridCellAttr',
|
||||
|
||||
'wxGridCornerHeaderRenderer',
|
||||
'wxGridHeaderLabelsRenderer',
|
||||
'wxGridRowHeaderRenderer',
|
||||
'wxGridColumnHeaderRenderer',
|
||||
'wxGridRowHeaderRendererDefault',
|
||||
'wxGridColumnHeaderRendererDefault',
|
||||
'wxGridCornerHeaderRendererDefault',
|
||||
|
||||
'wxGridCellAttrProvider',
|
||||
'wxGridTableBase',
|
||||
'wxGridSizesInfo',
|
||||
|
||||
'wxGrid',
|
||||
'wxGridUpdateLocker',
|
||||
|
||||
'wxGridEvent',
|
||||
'wxGridSizeEvent',
|
||||
'wxGridRangeSelectEvent',
|
||||
'wxGridEditorCreatedEvent',
|
||||
|
||||
]
|
||||
|
||||
#---------------------------------------------------------------------------
|
||||
|
||||
def run():
|
||||
# Parse the XML file(s) building a collection of Extractor objects
|
||||
module = etgtools.ModuleDef(PACKAGE, MODULE, NAME, DOCSTRING)
|
||||
etgtools.parseDoxyXML(module, ITEMS)
|
||||
|
||||
#-----------------------------------------------------------------
|
||||
# Tweak the parsed meta objects in the module object as needed for
|
||||
# customizing the generated code and docstrings.
|
||||
|
||||
c = module.find('wxGridCellCoords')
|
||||
assert isinstance(c, etgtools.ClassDef)
|
||||
tools.addAutoProperties(c)
|
||||
c.find('operator!').ignore()
|
||||
c.find('operator=').ignore()
|
||||
|
||||
# Add a typemap for 2 element sequences
|
||||
c.convertFromPyObject = tools.convertTwoIntegersTemplate('wxGridCellCoords')
|
||||
|
||||
c.addCppMethod('PyObject*', 'Get', '()', """\
|
||||
return sipBuildResult(0, "(ii)", self->GetRow(), self->GetCol());
|
||||
""",
|
||||
pyArgsString="() -> (row,col)",
|
||||
briefDoc="Return the row and col properties as a tuple.")
|
||||
|
||||
# Add sequence protocol methods and other goodies
|
||||
c.addPyMethod('__str__', '(self)', 'return str(self.Get())')
|
||||
c.addPyMethod('__repr__', '(self)', 'return "GridCellCoords"+str(self.Get())')
|
||||
c.addPyMethod('__len__', '(self)', 'return len(self.Get())')
|
||||
c.addPyMethod('__nonzero__', '(self)', 'return self.Get() != (0,0)')
|
||||
c.addPyMethod('__reduce__', '(self)', 'return (GridCellCoords, self.Get())')
|
||||
c.addPyMethod('__getitem__', '(self, idx)', 'return self.Get()[idx]')
|
||||
c.addPyMethod('__setitem__', '(self, idx, val)',
|
||||
"""\
|
||||
if idx == 0: self.Row = val
|
||||
elif idx == 1: self.Col = val
|
||||
else: raise IndexError
|
||||
""")
|
||||
c.addPyCode('GridCellCoords.__safe_for_unpickling__ = True')
|
||||
|
||||
module.addItem(
|
||||
tools.wxArrayWrapperTemplate('wxGridCellCoordsArray', 'wxGridCellCoords', module))
|
||||
|
||||
|
||||
#-----------------------------------------------------------------
|
||||
c = module.find('wxGridCellAttrProvider')
|
||||
c.addPrivateCopyCtor()
|
||||
|
||||
|
||||
#-----------------------------------------------------------------
|
||||
c = module.find('wxGrid')
|
||||
tools.fixWindowClass(c)
|
||||
c.bases = ['wxScrolledWindow']
|
||||
|
||||
|
||||
#-----------------------------------------------------------------
|
||||
c = module.find('wxGridSizesInfo')
|
||||
c.find('m_customSizes').ignore() # TODO: Add support for wxUnsignedToIntHashMap??
|
||||
|
||||
|
||||
#-----------------------------------------------------------------
|
||||
for name in ['wxGridEvent',
|
||||
'wxGridSizeEvent',
|
||||
'wxGridRangeSelectEvent',
|
||||
'wxGridEditorCreatedEvent',
|
||||
]:
|
||||
c = module.find(name)
|
||||
tools.fixEventClass(c)
|
||||
|
||||
|
||||
#-----------------------------------------------------------------
|
||||
def fixRendererClass(name):
|
||||
klass = module.find(name)
|
||||
assert isinstance(klass, etgtools.ClassDef)
|
||||
tools.addAutoProperties(klass)
|
||||
|
||||
methods = [
|
||||
('Clone', "virtual wxGridCellRenderer* Clone() const;"),
|
||||
('Draw', "virtual void Draw(wxGrid& grid, wxGridCellAttr& attr, wxDC& dc, "
|
||||
" const wxRect& rect, int row, int col, bool isSelected);"),
|
||||
('GetBestSize', "virtual wxSize GetBestSize(wxGrid& grid, wxGridCellAttr& attr, "
|
||||
" wxDC& dc, int row, int col);"),
|
||||
]
|
||||
for method, code in methods:
|
||||
if not klass.findItem(method):
|
||||
klass.addItem(etgtools.WigCode(code))
|
||||
|
||||
|
||||
c = module.find('wxGridCellRenderer')
|
||||
c.addPrivateCopyCtor()
|
||||
c.find('~wxGridCellRenderer').ignore(False)
|
||||
|
||||
for name in ITEMS:
|
||||
if 'Cell' in name and 'Renderer' in name:
|
||||
fixRendererClass(name)
|
||||
|
||||
|
||||
#-----------------------------------------------------------------
|
||||
def fixEditorClass(name):
|
||||
klass = module.find(name)
|
||||
assert isinstance(klass, etgtools.ClassDef)
|
||||
tools.addAutoProperties(klass)
|
||||
|
||||
methods = [
|
||||
('BeginEdit', "virtual void BeginEdit(int row, int col, wxGrid* grid);"),
|
||||
('Clone', "virtual wxGridCellEditor* Clone() const;"),
|
||||
('Create', "virtual void Create(wxWindow* parent, wxWindowID id, wxEvtHandler* evtHandler);"),
|
||||
('EndEdit', "virtual bool EndEdit(int row, int col, const wxGrid* grid, const wxString& oldval, wxString* newval);"),
|
||||
('ApplyEdit', "virtual void ApplyEdit(int row, int col, wxGrid* grid);"),
|
||||
('Reset', "virtual void Reset();"),
|
||||
]
|
||||
|
||||
|
||||
c = module.find('wxGridCellEditor')
|
||||
c.addPrivateCopyCtor()
|
||||
c.find('~wxGridCellEditor').ignore(False)
|
||||
|
||||
c = module.find('wxGridCellChoiceEditor')
|
||||
c.find('wxGridCellChoiceEditor').findOverload('count').ignore()
|
||||
|
||||
for name in ITEMS:
|
||||
if 'Cell' in name and 'Editor' in name:
|
||||
fixEditorClass(name)
|
||||
|
||||
|
||||
#-----------------------------------------------------------------
|
||||
c = module.find('wxGridCellAttr')
|
||||
c.addPrivateCopyCtor()
|
||||
c.find('~wxGridCellAttr').ignore(False)
|
||||
|
||||
|
||||
#-----------------------------------------------------------------
|
||||
c = module.find('wxGridUpdateLocker')
|
||||
c.addPrivateCopyCtor()
|
||||
|
||||
|
||||
#-----------------------------------------------------------------
|
||||
c = module.find('wxGridTableBase')
|
||||
c.addPrivateCopyCtor()
|
||||
|
||||
|
||||
|
||||
#-----------------------------------------------------------------
|
||||
# The insanceCode attribute is code that is used to make a default
|
||||
# instance of the class. We can't create them using the same class in
|
||||
# this case because they are abstract.
|
||||
|
||||
c = module.find('wxGridCornerHeaderRenderer')
|
||||
c.instanceCode = 'sipCpp = new wxGridCornerHeaderRendererDefault;'
|
||||
|
||||
c = module.find('wxGridRowHeaderRenderer')
|
||||
c.instanceCode = 'sipCpp = new wxGridRowHeaderRendererDefault;'
|
||||
|
||||
c = module.find('wxGridColumnHeaderRenderer')
|
||||
c.instanceCode = 'sipCpp = new wxGridColumnHeaderRendererDefault;'
|
||||
|
||||
|
||||
#-----------------------------------------------------------------
|
||||
#-----------------------------------------------------------------
|
||||
#-----------------------------------------------------------------
|
||||
tools.doCommonTweaks(module)
|
||||
tools.runGenerators(module)
|
||||
|
||||
|
||||
#---------------------------------------------------------------------------
|
||||
if __name__ == '__main__':
|
||||
run()
|
||||
|
||||
15
setup.py
15
setup.py
@@ -184,6 +184,21 @@ extensions.append(ext)
|
||||
cfg.CLEANUP.append(opj(cfg.PKGDIR, 'dataview.py'))
|
||||
|
||||
|
||||
etg = loadETG('etg/_grid.py')
|
||||
etgDepends = etg.DEPENDS + etg.OTHERDEPS
|
||||
ext = Extension('_grid', getEtgSipCppFiles(etg),
|
||||
depends = getEtgSipHeaders(etg),
|
||||
include_dirs = cfg.includes,
|
||||
define_macros = cfg.defines,
|
||||
library_dirs = cfg.libdirs,
|
||||
libraries = cfg.libs + cfg.makeLibName('adv', True),
|
||||
extra_compile_args = cfg.cflags,
|
||||
extra_link_args = cfg.lflags,
|
||||
)
|
||||
extensions.append(ext)
|
||||
cfg.CLEANUP.append(opj(cfg.PKGDIR, 'grid.py'))
|
||||
|
||||
|
||||
etg = loadETG('etg/_stc.py')
|
||||
etgDepends = etg.DEPENDS + etg.OTHERDEPS
|
||||
ext = Extension('_stc', getEtgSipCppFiles(etg),
|
||||
|
||||
16
unittests/test_grid.py
Normal file
16
unittests/test_grid.py
Normal file
@@ -0,0 +1,16 @@
|
||||
import imp_unittest, unittest
|
||||
import wtc
|
||||
import wx
|
||||
|
||||
#---------------------------------------------------------------------------
|
||||
|
||||
class grid_Tests(wtc.WidgetTestCase):
|
||||
|
||||
# TODO: Remove this test and add real ones.
|
||||
def test_grid1(self):
|
||||
self.fail("Unit tests for grid not implemented yet.")
|
||||
|
||||
#---------------------------------------------------------------------------
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
9
wscript
9
wscript
@@ -303,6 +303,15 @@ def build(bld):
|
||||
makeExtCopyRule(bld, '_dataview')
|
||||
|
||||
|
||||
etg = loadETG('etg/_grid.py')
|
||||
bld(features = 'c cxx cxxshlib pyext',
|
||||
target = makeTargetName(bld, '_grid'),
|
||||
source = getEtgSipCppFiles(etg) + rc,
|
||||
uselib = 'WXADV WXPY', # grid classes are also in the adv library
|
||||
)
|
||||
makeExtCopyRule(bld, '_grid')
|
||||
|
||||
|
||||
etg = loadETG('etg/_stc.py')
|
||||
bld(features = 'c cxx cxxshlib pyext',
|
||||
target = makeTargetName(bld, '_stc'),
|
||||
|
||||
Reference in New Issue
Block a user