Attachment #18114 for bug #29317

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

Lines 175-181 Link Here

(-)vegastrike/src/boost129/boost/python/operators.hpp (-2 / +2 lines)
175	{ \	175	{ \
176	template <class L, class R> \	176	template <class L, class R> \
177	inline detail::operator_<detail::op_##id,L,R> \	177	inline detail::operator_<detail::op_##id,L,R> \
178	operator##op(L const&, R const&) \	178	operator op(L const&, R const&) \
179	{ \	179	{ \
180	return detail::operator_<detail::op_##id,L,R>(); \	180	return detail::operator_<detail::op_##id,L,R>(); \
181	} \	181	} \
Lines 262-268 Link Here
262	{ \	262	{ \
263	template <class R> \	263	template <class R> \
264	inline detail::operator_<detail::op_##id,self_t,R> \	264	inline detail::operator_<detail::op_##id,self_t,R> \
265	operator##op(self_t const&, R const&) \	265	operator op(self_t const&, R const&) \
266	{ \	266	{ \
267	return detail::operator_<detail::op_##id,self_t,R>(); \	267	return detail::operator_<detail::op_##id,self_t,R>(); \
268	} \	268	} \




#define DIR_TEXT "textures/gui/"

// These defines are used by the image loader
#define TEXT_AREA_00 DIR_TEXT "button_down.png"
#define TEXT_AREA_01 DIR_TEXT "button_up.png"
#define TEXT_AREA_02 DIR_TEXT "corner_top_left.png"
#define TEXT_AREA_03 DIR_TEXT "corner_top_right.png"
#define TEXT_AREA_04 DIR_TEXT "corner_bottom_left.png"
#define TEXT_AREA_05 DIR_TEXT "corner_bottom_right.png"
#define TEXT_AREA_06 DIR_TEXT "highlight_button_up.png"
#define TEXT_AREA_07 DIR_TEXT "highlight_button_down.png"
#define TEXT_AREA_08 DIR_TEXT "horizontal.png"
#define TEXT_AREA_09 DIR_TEXT "left_side.png"
#define TEXT_AREA_10 DIR_TEXT "right_side.png"
#define TEXT_AREA_11 DIR_TEXT "scrollbar.png"
#define TEXT_AREA_12 DIR_TEXT "highlight_scrollbar.png"
#define TEXT_AREA_13 DIR_TEXT "horizontal_end.png"

// These defines are used by the class functions to locate the texture in the array (above)
#define IMG_BUTTON_DOWN 0

Return to bug 29317

Lines 49-68 Link Here

(-)vegastrike/src/gui/text_area.h (-14 / +14 lines)
49	#define DIR_TEXT "textures/gui/"	49	#define DIR_TEXT "textures/gui/"
50		50
51	// These defines are used by the image loader	51	// These defines are used by the image loader
52	#define TEXT_AREA_00 DIR_TEXT ## "button_down.png"	52	#define TEXT_AREA_00 DIR_TEXT "button_down.png"
53	#define TEXT_AREA_01 DIR_TEXT ## "button_up.png"	53	#define TEXT_AREA_01 DIR_TEXT "button_up.png"
54	#define TEXT_AREA_02 DIR_TEXT ## "corner_top_left.png"	54	#define TEXT_AREA_02 DIR_TEXT "corner_top_left.png"
55	#define TEXT_AREA_03 DIR_TEXT ## "corner_top_right.png"	55	#define TEXT_AREA_03 DIR_TEXT "corner_top_right.png"
56	#define TEXT_AREA_04 DIR_TEXT ## "corner_bottom_left.png"	56	#define TEXT_AREA_04 DIR_TEXT "corner_bottom_left.png"
57	#define TEXT_AREA_05 DIR_TEXT ## "corner_bottom_right.png"	57	#define TEXT_AREA_05 DIR_TEXT "corner_bottom_right.png"
58	#define TEXT_AREA_06 DIR_TEXT ## "highlight_button_up.png"	58	#define TEXT_AREA_06 DIR_TEXT "highlight_button_up.png"
59	#define TEXT_AREA_07 DIR_TEXT ## "highlight_button_down.png"	59	#define TEXT_AREA_07 DIR_TEXT "highlight_button_down.png"
60	#define TEXT_AREA_08 DIR_TEXT ## "horizontal.png"	60	#define TEXT_AREA_08 DIR_TEXT "horizontal.png"
61	#define TEXT_AREA_09 DIR_TEXT ## "left_side.png"	61	#define TEXT_AREA_09 DIR_TEXT "left_side.png"
62	#define TEXT_AREA_10 DIR_TEXT ## "right_side.png"	62	#define TEXT_AREA_10 DIR_TEXT "right_side.png"
63	#define TEXT_AREA_11 DIR_TEXT ## "scrollbar.png"	63	#define TEXT_AREA_11 DIR_TEXT "scrollbar.png"
64	#define TEXT_AREA_12 DIR_TEXT ## "highlight_scrollbar.png"	64	#define TEXT_AREA_12 DIR_TEXT "highlight_scrollbar.png"
65	#define TEXT_AREA_13 DIR_TEXT ## "horizontal_end.png"	65	#define TEXT_AREA_13 DIR_TEXT "horizontal_end.png"
66		66
67	// These defines are used by the class functions to locate the texture in the array (above)	67	// These defines are used by the class functions to locate the texture in the array (above)
68	#define IMG_BUTTON_DOWN 0	68	#define IMG_BUTTON_DOWN 0