summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2015-03-21 17:17:46 (GMT)
committerdgp <dgp@users.sourceforge.net>2015-03-21 17:17:46 (GMT)
commit97be0552093b567949f1e78bfc9024dc24fba4e7 (patch)
treeedcc76e5dcd76ce3088d8cdc2edb923894ffd1d4
parent331bd99b1e9cb2e4af8e528b829a94080aae89e8 (diff)
downloadtk-97be0552093b567949f1e78bfc9024dc24fba4e7.zip
tk-97be0552093b567949f1e78bfc9024dc24fba4e7.tar.gz
tk-97be0552093b567949f1e78bfc9024dc24fba4e7.tar.bz2
Fixed failed compile.
-rw-r--r--macosx/tkMacOSXWm.c34
1 files changed, 11 insertions, 23 deletions
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index 82de883..37a1d25 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -342,28 +342,6 @@ static void RemapWindows(TkWindow *winPtr,
{
id _i1, _i2;
}
-
-- (id) retain
-{
-#if DEBUG_ZOMBIES
- const char *title = [[self title] UTF8String];
- if (title != NULL) {
- printf("Retaining %s with count %lu\n", title, [self retainCount]);
- }
-#endif
- return [super retain];
-}
-
-- (id) retain
-{
-#if DEBUG_ZOMBIES
- const char *title = [[self title] UTF8String];
- if (title != NULL) {
- printf("Retaining %s with count %lu\n", title, [self retainCount]);
- }
-#endif
- return [super retain];
-}
@end
@implementation TKWindow
@@ -379,6 +357,16 @@ static void RemapWindows(TkWindow *winPtr,
kWindowNoActivatesAttribute)) ? NO : YES;
}
+- (id) retain
+{
+#if DEBUG_ZOMBIES
+ const char *title = [[self title] UTF8String];
+ if (title != NULL) {
+ printf("Retaining %s with count %lu\n", title, [self retainCount]);
+ }
+#endif
+ return [super retain];
+}
@end
#pragma mark -
@@ -6012,7 +6000,7 @@ TkWmStackorderToplevel(
NSInteger windowCount = [macWindows count];
if (!windowCount) {
- ckfree(windows);
+ ckfree((char *)windows);
windows = NULL;
} else {
windowPtr = windows + table.numEntries;