Attachment #83476 for bug #128200

View | Details | Raw Unified | Return to bug 128200
Collapse All | Expand All

Lines 75-79 Link Here

(-)SDL_gui-0.10.3.old/src/AbstractButton.cc (-1 / +4 lines)
75		75
76	void GUI_AbstractButton::SetClick(GUI_Callback *callback)	76	void GUI_AbstractButton::SetClick(GUI_Callback *callback)
77	{	77	{
78	GUI_ObjectKeep((GUI_Object **) &click, callback);	78	GUI_Object * temp;
		79	temp = (GUI_Object *)click;
		80	GUI_ObjectKeep(&temp, callback);
		81	click = (GUI_Callback *)temp;
79	}	82	}

Lines 54-79 Link Here

(-)SDL_gui-0.10.3.old/src/Button.cc (-4 / +28 lines)
54		54
55	void GUI_Button::SetNormalImage(GUI_Surface *surface)	55	void GUI_Button::SetNormalImage(GUI_Surface *surface)
56	{	56	{
57	if (GUI_ObjectKeep((GUI_Object **) &normal, surface))	57	GUI_Object * temp;
		58	temp = (GUI_Object *)normal;
		59	if (GUI_ObjectKeep(&temp, surface)){
		60	normal = (GUI_Surface *)temp;
58	MarkChanged();	61	MarkChanged();
		62	}
		63	else
		64	normal = (GUI_Surface *)temp;
59	}	65	}
60		66
61	void GUI_Button::SetHighlightImage(GUI_Surface *surface)	67	void GUI_Button::SetHighlightImage(GUI_Surface *surface)
62	{	68	{
63	if (GUI_ObjectKeep((GUI_Object **) &highlight, surface))	69	GUI_Object * temp;
		70	temp = (GUI_Object *)highlight;
		71	if (GUI_ObjectKeep(&temp, surface)){
		72	highlight = (GUI_Surface *)temp;
64	MarkChanged();	73	MarkChanged();
		74	}
		75	else
		76	highlight = (GUI_Surface *)temp;
65	}	77	}
66		78
67	void GUI_Button::SetPressedImage(GUI_Surface *surface)	79	void GUI_Button::SetPressedImage(GUI_Surface *surface)
68	{	80	{
69	if (GUI_ObjectKeep((GUI_Object **) &pressed, surface))	81	GUI_Object * temp;
		82	temp = (GUI_Object *)pressed;
		83	if (GUI_ObjectKeep(&temp, surface)){
		84	pressed = (GUI_Surface *)temp;
70	MarkChanged();	85	MarkChanged();
		86	}
		87	else
		88	pressed = (GUI_Surface *)temp;
71	}	89	}
72		90
73	void GUI_Button::SetDisabledImage(GUI_Surface *surface)	91	void GUI_Button::SetDisabledImage(GUI_Surface *surface)
74	{	92	{
75	if (GUI_ObjectKeep((GUI_Object **) &disabled, surface))	93	GUI_Object * temp;
		94	temp = (GUI_Object *)disabled;
		95	if (GUI_ObjectKeep(&temp, surface)){
		96	disabled = (GUI_Surface *)temp;
76	MarkChanged();	97	MarkChanged();
		98	}
		99	else
		100	disabled = (GUI_Surface *)temp;
77	}	101	}
78		102
79	extern "C"	103	extern "C"

Lines 165-172 Link Here

(-)SDL_gui-0.10.3.old/src/Container.cc (-1 / +7 lines)
165		165
166	void GUI_Container::SetBackground(GUI_Surface *surface)	166	void GUI_Container::SetBackground(GUI_Surface *surface)
167	{	167	{
168	if (GUI_ObjectKeep((GUI_Object **) &background, surface))	168	GUI_Object* temp;
		169	temp = (GUI_Object *)background;
		170	if (GUI_ObjectKeep(&temp, surface)){
		171	background = (GUI_Surface*)temp;
169	MarkChanged();	172	MarkChanged();
		173	}
		174	else
		175	background = (GUI_Surface*)temp;
170	}	176	}
171		177
172	void GUI_Container::SetBackgroundColor(SDL_Color c)	178	void GUI_Container::SetBackgroundColor(SDL_Color c)

Lines 229-235 Link Here

(-)SDL_gui-0.10.3.old/src/Drawable.cc (-1 / +4 lines)
229		229
230	void GUI_Drawable::SetStatusCallback(GUI_Callback *callback)	230	void GUI_Drawable::SetStatusCallback(GUI_Callback *callback)
231	{	231	{
232	GUI_ObjectKeep((GUI_Object **) &status_callback, callback);	232	GUI_Object* temp;
		233	temp = (GUI_Object *)status_callback;
		234	GUI_ObjectKeep(&temp, callback);
		235	status_callback = (GUI_Callback *)temp;
233	}	236	}
234		237
235	int GUI_Drawable::GetFlagDelta(void)	238	int GUI_Drawable::GetFlagDelta(void)

Lines 77-84 Link Here

(-)SDL_gui-0.10.3.old/src/Label.cc (-1 / +7 lines)
77		77
78	void GUI_Label::SetFont(GUI_Font *afont)	78	void GUI_Label::SetFont(GUI_Font *afont)
79	{	79	{
80	if (GUI_ObjectKeep((GUI_Object **) &font, afont))	80	GUI_Object* temp;
		81	temp = (GUI_Object *)font;
		82	if (GUI_ObjectKeep(&temp, afont)){
		83	font = (GUI_Font *)temp;
81	MarkChanged();	84	MarkChanged();
		85	}
		86	else
		87	font = (GUI_Font *)temp;
82	// FIXME: should re-draw the text	88	// FIXME: should re-draw the text
83	}	89	}
84		90

Lines 58-68 Link Here

(-)SDL_gui-0.10.3.old/src/Panel.cc (-1 / +6 lines)
58		58
59	void GUI_Panel::SetLayout(GUI_Layout *a_layout)	59	void GUI_Panel::SetLayout(GUI_Layout *a_layout)
60	{	60	{
61	if (GUI_ObjectKeep((GUI_Object **) &layout, a_layout))	61	GUI_Object * temp;
		62	temp = (GUI_Object *)layout;
		63	if (GUI_ObjectKeep(&temp, a_layout))
62	{	64	{
		65	layout = (GUI_Layout *)temp;
63	UpdateLayout();	66	UpdateLayout();
64	MarkChanged();	67	MarkChanged();
65	}	68	}
		69	else
		70	layout = (GUI_Layout *)temp;
66	}	71	}
67		72
68	extern "C"	73	extern "C"

Lines 76-83 Link Here

(-)SDL_gui-0.10.3.old/src/Picture.cc (-1 / +7 lines)
76		76
77	void GUI_Picture::SetImage(GUI_Surface *an_image)	77	void GUI_Picture::SetImage(GUI_Surface *an_image)
78	{	78	{
79	if (GUI_ObjectKeep((GUI_Object **) &image, an_image))	79	GUI_Object *temp;
		80	temp = (GUI_Object *)image;
		81	if (GUI_ObjectKeep(&temp, an_image)){
		82	image = (GUI_Surface *)temp;
80	MarkChanged();	83	MarkChanged();
		84	}
		85	else
		86	image = (GUI_Surface *)temp;
81	}	87	}
82		88
83	void GUI_Picture::SetCaption(GUI_Widget *a_caption)	89	void GUI_Picture::SetCaption(GUI_Widget *a_caption)

Lines 76-89 Link Here

(-)SDL_gui-0.10.3.old/src/ProgressBar.cc (-2 / +14 lines)
76		76
77	void GUI_ProgressBar::SetImage1(GUI_Surface *image)	77	void GUI_ProgressBar::SetImage1(GUI_Surface *image)
78	{	78	{
79	if (GUI_ObjectKeep((GUI_Object **) &image1, image))	79	GUI_Object * temp;
		80	temp = (GUI_Object *) image1;
		81	if (GUI_ObjectKeep(&temp, image)){
		82	image1 = (GUI_Surface *)temp;
80	MarkChanged();	83	MarkChanged();
		84	}
		85	else
		86	image1 = (GUI_Surface *)temp;
81	}	87	}
82		88
83	void GUI_ProgressBar::SetImage2(GUI_Surface *image)	89	void GUI_ProgressBar::SetImage2(GUI_Surface *image)
84	{	90	{
85	if (GUI_ObjectKeep((GUI_Object **) &image2, image))	91	GUI_Object * temp;
		92	temp = (GUI_Object *) image2;
		93	if (GUI_ObjectKeep(&temp, image)){
		94	image2 = (GUI_Surface *)temp;
86	MarkChanged();	95	MarkChanged();
		96	}
		97	else
		98	image2 = (GUI_Surface *)temp;
87	}	99	}
88		100
89	void GUI_ProgressBar::SetPosition(double a_value)	101	void GUI_ProgressBar::SetPosition(double a_value)

Lines 154-161 Link Here

(-)SDL_gui-0.10.3.old/src/Screen.cc (-1 / +7 lines)
154		154
155	void GUI_Screen::SetBackground(GUI_Surface *image)	155	void GUI_Screen::SetBackground(GUI_Surface *image)
156	{	156	{
157	if (GUI_ObjectKeep((GUI_Object **) &background, image))	157	GUI_Object * temp;
		158	temp = (GUI_Object *)background;
		159	if (GUI_ObjectKeep(&temp, image)){
		160	background = (GUI_Surface *)temp;
158	MarkChanged();	161	MarkChanged();
		162	}
		163	else
		164	background = (GUI_Surface *)temp;
159	}	165	}
160		166
161	void GUI_Screen::SetBackgroundColor(SDL_Color c)	167	void GUI_Screen::SetBackgroundColor(SDL_Color c)

Lines 159-172 Link Here

(-)SDL_gui-0.10.3.old/src/ScrollBar.cc (-3 / +18 lines)
159		159
160	void GUI_ScrollBar::SetKnobImage(GUI_Surface *image)	160	void GUI_ScrollBar::SetKnobImage(GUI_Surface *image)
161	{	161	{
162	if (GUI_ObjectKeep((GUI_Object **) &knob, image))	162	GUI_Object* temp;
		163	temp = (GUI_Object *)knob;
		164	if (GUI_ObjectKeep(&temp, image)){
		165	knob = (GUI_Surface *)temp;
163	MarkChanged();	166	MarkChanged();
		167	}
		168	else
		169	knob = (GUI_Surface *)temp;
164	}	170	}
165		171
166	void GUI_ScrollBar::SetBackgroundImage(GUI_Surface *image)	172	void GUI_ScrollBar::SetBackgroundImage(GUI_Surface *image)
167	{	173	{
168	if (GUI_ObjectKeep((GUI_Object **) &background, image))	174	GUI_Object* temp;
		175	temp = (GUI_Object *)background;
		176	if (GUI_ObjectKeep(&temp, image)){
		177	background = (GUI_Surface *)temp;
169	MarkChanged();	178	MarkChanged();
		179	}
		180	else
		181	background = (GUI_Surface *)temp;
170	}	182	}
171		183
172	int GUI_ScrollBar::GetPosition(void)	184	int GUI_ScrollBar::GetPosition(void)
Lines 186-192 Link Here
186		198
187	void GUI_ScrollBar::SetMovedCallback(GUI_Callback *callback)	199	void GUI_ScrollBar::SetMovedCallback(GUI_Callback *callback)
188	{	200	{
189	GUI_ObjectKeep((GUI_Object **) &moved_callback, callback);	201	GUI_Object * temp;
		202	temp = (GUI_Object *)moved_callback;
		203	GUI_ObjectKeep(&temp, callback);
		204	moved_callback = (GUI_Callback *)temp;
190	}	205	}
191		206
192	extern "C"	207	extern "C"

Lines 164-170 Link Here

(-)SDL_gui-0.10.3.old/src/TextEntry.cc (-6 / +33 lines)
164		164
165	void GUI_TextEntry::SetFont(GUI_Font *afont)	165	void GUI_TextEntry::SetFont(GUI_Font *afont)
166	{	166	{
167	GUI_ObjectKeep((GUI_Object **) &font, afont);	167	GUI_Object * temp;
		168	temp = (GUI_Object *)font;
		169	GUI_ObjectKeep(&temp, afont);
		170	font = (GUI_Font *)temp;
168	/* FIXME: should re-draw the text in the new color */	171	/* FIXME: should re-draw the text in the new color */
169	}	172	}
170		173
Lines 195-224 Link Here
195		198
196	void GUI_TextEntry::SetNormalImage(GUI_Surface *surface)	199	void GUI_TextEntry::SetNormalImage(GUI_Surface *surface)
197	{	200	{
198	if (GUI_ObjectKeep((GUI_Object **) &normal_image, surface))	201	GUI_Object * temp;
		202	temp = (GUI_Object *)normal_image;
		203	if (GUI_ObjectKeep(&temp, surface)){
		204	normal_image = (GUI_Surface *)temp;
199	MarkChanged();	205	MarkChanged();
		206	}
		207	else
		208	normal_image = (GUI_Surface *)temp;
200	}	209	}
201		210
202	void GUI_TextEntry::SetHighlightImage(GUI_Surface *surface)	211	void GUI_TextEntry::SetHighlightImage(GUI_Surface *surface)
203	{	212	{
204	if (GUI_ObjectKeep((GUI_Object **) &highlight_image, surface))	213	GUI_Object * temp;
		214	temp = (GUI_Object *)highlight_image;
		215	if (GUI_ObjectKeep(&temp, surface)){
		216	highlight_image = (GUI_Surface *)temp;
205	MarkChanged();	217	MarkChanged();
		218	}
		219	else
		220	highlight_image = (GUI_Surface *)temp;
206	}	221	}
207		222
208	void GUI_TextEntry::SetFocusImage(GUI_Surface *surface)	223	void GUI_TextEntry::SetFocusImage(GUI_Surface *surface)
209	{	224	{
210	if (GUI_ObjectKeep((GUI_Object **) &focus_image, surface))	225	GUI_Object * temp;
		226	temp = (GUI_Object *)focus_image;
		227	if (GUI_ObjectKeep(&temp, surface)){
		228	focus_image = (GUI_Surface*)temp;
211	MarkChanged();	229	MarkChanged();
		230	}
		231	else
		232	focus_image = (GUI_Surface*)temp;
212	}	233	}
213		234
214	void GUI_TextEntry::SetFocusCallback(GUI_Callback *callback)	235	void GUI_TextEntry::SetFocusCallback(GUI_Callback *callback)
215	{	236	{
216	GUI_ObjectKeep((GUI_Object **) &focus_callback, callback);	237	GUI_Object * temp;
		238	temp = (GUI_Object *)focus_callback;
		239	GUI_ObjectKeep(&temp, callback);
		240	focus_callback = (GUI_Callback *)temp;
217	}	241	}
218		242
219	void GUI_TextEntry::SetUnfocusCallback(GUI_Callback *callback)	243	void GUI_TextEntry::SetUnfocusCallback(GUI_Callback *callback)
220	{	244	{
221	GUI_ObjectKeep((GUI_Object **) &unfocus_callback, callback);	245	GUI_Object * temp;
		246	temp = (GUI_Object *)unfocus_callback;
		247	GUI_ObjectKeep(&temp, callback);
		248	unfocus_callback = (GUI_Callback *)temp;
222	}	249	}
223		250
224	extern "C"	251	extern "C"

Lines 62-87 Link Here

(-)SDL_gui-0.10.3.old/src/ToggleButton.cc (-4 / +25 lines)
62		62
63	void GUI_ToggleButton::SetOnNormalImage(GUI_Surface *surface)	63	void GUI_ToggleButton::SetOnNormalImage(GUI_Surface *surface)
64	{	64	{
65	if (GUI_ObjectKeep((GUI_Object **) &on_normal, surface))	65	GUI_Object * temp;
		66	temp = (GUI_Object *)on_normal;
		67	if (GUI_ObjectKeep(&temp, surface)){
66	MarkChanged();	68	MarkChanged();
		69	}
		70	else
		71	on_normal = (GUI_Surface *)temp;
67	}	72	}
68		73
69	void GUI_ToggleButton::SetOffNormalImage(GUI_Surface *surface)	74	void GUI_ToggleButton::SetOffNormalImage(GUI_Surface *surface)
70	{	75	{
71	if (GUI_ObjectKeep((GUI_Object **) &off_normal, surface))	76	GUI_Object * temp;
		77	temp = (GUI_Object *)off_normal;
		78	if (GUI_ObjectKeep(&temp, surface)){
72	MarkChanged();	79	MarkChanged();
		80	}
		81	else
		82	off_normal = (GUI_Surface *)temp;
73	}	83	}
74		84
75	void GUI_ToggleButton::SetOnHighlightImage(GUI_Surface *surface)	85	void GUI_ToggleButton::SetOnHighlightImage(GUI_Surface *surface)
76	{	86	{
77	if (GUI_ObjectKeep((GUI_Object **) &on_highlight, surface))	87	GUI_Object * temp;
		88	temp = (GUI_Object *)on_highlight;
		89	if (GUI_ObjectKeep(&temp, surface)){
78	MarkChanged();	90	MarkChanged();
		91	}
		92	else
		93	on_highlight = (GUI_Surface *)temp;
		94
79	}	95	}
80		96
81	void GUI_ToggleButton::SetOffHighlightImage(GUI_Surface *surface)	97	void GUI_ToggleButton::SetOffHighlightImage(GUI_Surface *surface)
82	{	98	{
83	if (GUI_ObjectKeep((GUI_Object **) &off_highlight, surface))	99	GUI_Object * temp;
		100	temp = (GUI_Object *)off_highlight;
		101	if (GUI_ObjectKeep(&temp, surface)){
84	MarkChanged();	102	MarkChanged();
		103	}
		104	else
		105	off_highlight = (GUI_Surface *)temp;
85	}	106	}
86		107
87	extern "C"	108	extern "C"

Return to bug 128200