Fix releasing control handlers/delegates

roblillack · May 27, 2024 · 270a541 · 270a541
1 parent 101ca94
commit 270a541
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 4 deletions.
diff --git a/button.m b/button.m
@@ -12,7 +12,6 @@ ButtonPtr Button_New(int goButtonID, int x, int y, int w, int h) {
     id nsButton = [[[NSButton alloc] initWithFrame:NSMakeRect(x, y, w, h)] autorelease];
     ButtonHandler* handler = [[ButtonHandler alloc] init];
     [handler setGoButtonID:goButtonID];
-    [handler autorelease];
     [nsButton setTarget:handler];
     [nsButton setAction:@selector(buttonClicked:)];
 
@@ -30,6 +29,7 @@ void Button_SetTitle(ButtonPtr btnPtr, const char* title) {
 void Button_Remove(ButtonPtr btnPtr) {
     NSButton* button = (NSButton*)btnPtr;
     [button removeFromSuperview];
+    [[button target] release];
 }
 
 const char* Button_Title(ButtonPtr btnPtr) {

diff --git a/combobox.m b/combobox.m
@@ -13,7 +13,6 @@ ComboBoxPtr ComboBox_New(int goComboBoxID, int x, int y, int w, int h) {
     id nsComboBox = [[[NSComboBox alloc] initWithFrame:NSMakeRect(x, y, w, h)] autorelease];
     ComboBoxHandler* handler = [[ComboBoxHandler alloc] init];
     [handler setGoComboBoxID:goComboBoxID];
-    [handler autorelease];
     [nsComboBox setDelegate:handler];
     [nsComboBox setTarget:handler];
     [nsComboBox setAction:@selector(comboBoxSelectionDidChange:)];
@@ -63,4 +62,5 @@ void ComboBox_SetStringValue(ComboBoxPtr comboBoxPtr, const char* stringValue) {
 void ComboBox_Remove(ComboBoxPtr comboBoxPtr) {
     NSComboBox* comboBox = (NSComboBox*)comboBoxPtr;
     [comboBox removeFromSuperview];
+    [[comboBox target] release];
 }
diff --git a/slider.m b/slider.m
@@ -15,7 +15,6 @@ SliderPtr Slider_New(int goSliderID, int x, int y, int w, int h) {
     [handler setGoSliderID:goSliderID];
     [nsSlider setTarget:handler];
     [nsSlider setAction:@selector(sliderValueChanged:)];
-    // [handler autorelease];
 
 	return (SliderPtr)nsSlider;
 }
@@ -48,4 +47,5 @@ void Slider_SetSliderType(SliderPtr sliderPtr, int sliderType) {
 void Slider_Remove(SliderPtr sliderPtr) {
     NSSlider* slider = (NSSlider*)sliderPtr;
     [slider removeFromSuperview];
+    [[slider target] release];
 }
diff --git a/stepper.m b/stepper.m
@@ -13,7 +13,6 @@ StepperPtr Stepper_New(int goStepperId, int x, int y, int w, int h) {
 
   StepperHandler *handler = [[StepperHandler alloc] init];
   [handler setGoStepperId:goStepperId];
-  [handler autorelease];
   [nsStepper setTarget:handler];
   [nsStepper setAction:@selector(stepperValueChanged:)];
 
@@ -58,4 +57,5 @@ void Stepper_SetValueWraps(StepperPtr StepperPtr, bool wraps) {
 void Stepper_Remove(StepperPtr StepperPtr) {
   NSStepper *stepper = (NSStepper *)StepperPtr;
   [stepper removeFromSuperview];
+  [[stepper target] release];
 }
diff --git a/tableview.m b/tableview.m
@@ -67,6 +67,7 @@ TableViewPtr TableView_New(int goTableViewId, int x, int y, int w, int h) {
 void TableView_Remove(TableViewPtr tableViewPtr) {
   NSScrollView *x = (NSScrollView *)tableViewPtr;
   [x removeFromSuperview];
+  [[x delegate] release];
 }
 
 const int TableView_IsEnabled(TableViewPtr tableViewPtr) {

diff --git a/textfield.m b/textfield.m
@@ -29,6 +29,7 @@ void TextField_SetStringValue(TextFieldPtr textFieldPtr, const char* text) {
 void TextField_Remove(TextFieldPtr textFieldPtr) {
 	NSTextField* tf = (NSTextField*)textFieldPtr;
 	[tf removeFromSuperview];
+	[[tf delegate] release];
 }
 
 const int TextField_Enabled(TextFieldPtr textFieldPtr) {