From 45d4915d88edab2f9bbef555154a842fc826030b Mon Sep 17 00:00:00 2001 From: Virgil Dupras Date: Thu, 12 Jan 2012 14:23:10 -0500 Subject: [PATCH] Converted objp code to 2-steps instantiation. --HG-- branch : objp --- cocoa/base/DetailsPanel.m | 3 ++- cocoa/base/ExtraFairwareReminder.m | 3 ++- cocoa/base/StatsLabel.m | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cocoa/base/DetailsPanel.m b/cocoa/base/DetailsPanel.m index 31d67dc3..ce49743c 100644 --- a/cocoa/base/DetailsPanel.m +++ b/cocoa/base/DetailsPanel.m @@ -14,7 +14,8 @@ http://www.hardcoded.net/licenses/bsd_license { self = [super initWithWindowNibName:@"DetailsPanel"]; [self window]; //So the detailsTable is initialized. - py = createPyWrapper(@"PyDetailsPanel", @"details_panel", @"DetailsPanelView", self); + py = [[PyDetailsPanel alloc] initWithModel:findHackishModel(@"details_panel")]; + [py bindCallback:createCallback(@"DetailsPanelView", self)]; [py connect]; return self; } diff --git a/cocoa/base/ExtraFairwareReminder.m b/cocoa/base/ExtraFairwareReminder.m index ef70b6fa..ff044198 100644 --- a/cocoa/base/ExtraFairwareReminder.m +++ b/cocoa/base/ExtraFairwareReminder.m @@ -15,7 +15,8 @@ http://www.hardcoded.net/licenses/bsd_license self = [super initWithWindowNibName:@"ExtraFairwareReminder"]; [self window]; [continueButton setEnabled:NO]; - py = createPyWrapper(@"PyExtraFairwareReminder", @"extra_fairware_reminder", @"ExtraFairwareReminderView", self); + py = [[PyExtraFairwareReminder alloc] initWithModel:findHackishModel(@"extra_fairware_reminder")]; + [py bindCallback:createCallback(@"ExtraFairwareReminderView", self)]; return self; } diff --git a/cocoa/base/StatsLabel.m b/cocoa/base/StatsLabel.m index ab282219..8cca04ed 100644 --- a/cocoa/base/StatsLabel.m +++ b/cocoa/base/StatsLabel.m @@ -14,7 +14,8 @@ http://www.hardcoded.net/licenses/bsd_license { self = [self init]; view = [aLabelView retain]; - py = createPyWrapper(@"PyStatsLabel", @"stats_label", @"StatsLabelView", self); + py = [[PyStatsLabel alloc] initWithModel:findHackishModel(@"stats_label")]; + [py bindCallback:createCallback(@"StatsLabelView", self)]; [[self py] connect]; return self; }