Skip to content

Commit a5125bb

Browse files
committed
Add wx.ListCtrl.
Still have issue with an infinite recursion
1 parent 24b8c86 commit a5125bb

File tree

7 files changed

+8
-7
lines changed

7 files changed

+8
-7
lines changed

cffi/wrapper_lib/cppwrapper.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,9 @@ def setup_offsets_table(self, ptr):
130130
# Only store non-0 offsets. Unstored offsets are assume 0.
131131
self.offsets[base] = offset
132132
# Copy the offsets to each base's base, adding the offset
133-
for (base_base, base_offset) in \
134-
base._castdata.get_offsets_table(ptr).iteritems():
135-
self.offsets[base_base] = base_offset + offset
133+
for (base_base, base_cast_func) in base._castdata.castfuncs:
134+
casted_ptr = base_cast_func(ptr)
135+
self.offsets[base_base] = (casted_ptr - ptr) + offset
136136
else:
137137
# Copy the offsets to each base's base
138138
self.offsets.update(base._castdata.get_offsets_table(ptr))

etg/_adv.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#'sound',
3838
#'joystick',
3939
#'animate',
40-
#'bannerwindow',
40+
'bannerwindow',
4141
#'editlbox',
4242
#'notifmsg',
4343
'splash',

etg/_core.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@
148148
'textctrl',
149149
'combobox',
150150
'checkbox',
151-
#'listbox',
152-
#'checklst',
151+
'listbox',
152+
'checklst',
153153
'gauge',
154154
'headercol',
155155
'headerctrl',
File renamed without changes.
File renamed without changes.
File renamed without changes.

etgtools/cffi/function/method.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,8 @@ def can_override(self, other):
295295
return all(p == other.params[i] for i, p in enumerate(self.params))
296296

297297
def copy_onto_subclass(self, cls):
298-
InheritedVirtualMethod(self, cls)
298+
if self.virtual: # XXX(amauryfa): Why this check???
299+
InheritedVirtualMethod(self, cls)
299300

300301
class InheritedVirtualMethodMixin(object):
301302
@args_string

0 commit comments

Comments
 (0)