eliminate compile warning

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1407 bbd45198-f89e-11dd-88c7-29a3b14d5316

2 files changed, 0 insertions, 463 deletions

diff --git a/examples/module/ftk_demo/demo_bidi.c b/examples/module/ftk_demo/demo_bidi.c
deleted file mode 100644
index f6d0444db1..0000000000
--- a/examples/module/ftk_demo/demo_bidi.c
+++ /dev/null
@@ -1,88 +0,0 @@
-#include "ftk.h"
-
-typedef struct _TimerInfo
-{
-	int times;
-	FtkWidget* label;
-}TimerInfo;
-
-static Ret timeout(void* ctx)
-{
-	TimerInfo* info = ctx;
-	char buffer[32] = {0};
-	if(info->times > 0)
-	{
-		snprintf(buffer, sizeof(buffer), "Quit after %d seconds", info->times);
-		ftk_widget_set_text(info->label, buffer);
-		info->times--;
-
-		return RET_OK;
-	}
-	else
-	{
-		ftk_widget_unref(ftk_widget_toplevel(info->label));
-		ftk_logd("%s: timeout and quit.\n", __func__);
-		FTK_FREE(info);
-		FTK_QUIT();
-		return RET_REMOVE;
-	}
-}
-
-#ifdef FTK_AS_PLUGIN
-#include "ftk_app_demo.h"
-FTK_HIDE int FTK_MAIN(int argc, char* argv[]);
-FtkApp* ftk_app_demo_bidi_create()
-{
-	return ftk_app_demo_create(_("bidi"), ftk_main);
-}
-#else
-#define FTK_HIDE extern
-#endif /*FTK_AS_PLUGIN*/
-
-FTK_HIDE int FTK_MAIN(int argc, char* argv[])
-{
-	int width = 0;
-	int height = 0;
-	FtkGc gc = {.mask = FTK_GC_BG};
-	TimerInfo* info = NULL;
-
-	FTK_INIT(argc, argv);
-	info = (TimerInfo*)FTK_ZALLOC(sizeof(TimerInfo));
-	info->times = 100;
-		
-	FtkSource* timer = ftk_source_timer_create(1000, timeout, info);
-	FtkWidget* win = ftk_app_window_create();
-
-	width = ftk_widget_width(win);
-	height = ftk_widget_height(win);
-
-	FtkWidget* label = ftk_label_create(win, 10, 10, width - 20, 20);
-	ftk_widget_set_text(label, "arabic bidi demo");
-	
-	label = ftk_label_create(win, 10, 40, width - 20, 20);
-	ftk_widget_set_text(label, "English Text");
-	assert(strcmp(ftk_widget_get_text(label), "English Text") == 0);
-	
-	gc.bg.a = 0xff;
-	gc.bg.r = 0xF0;
-	gc.bg.g = 0xF0;
-	gc.bg.b = 0x80;
-	label = ftk_label_create(win, 10, height/2, width - 20, 120);
-	ftk_widget_set_gc(label, FTK_WIDGET_INSENSITIVE, &gc);
-	ftk_widget_unset_attr(label, FTK_ATTR_TRANSPARENT);
-	ftk_widget_set_text(label, "ان منح حياتك للمسيح تعد خطوة ايمان يمكنك القيام بها عن طريق الصلاة");
-	
-	label = ftk_label_create(win, 50, height/2-30, width, 20);
-	info->label = label;
-	
-	ftk_widget_set_text(win, "label demo");
-	ftk_widget_show_all(win, 1);
-
-	ftk_widget_set_attr(win, FTK_ATTR_IGNORE_CLOSE);
-	ftk_main_loop_add_source(ftk_default_main_loop(), timer);
-
-	FTK_RUN();
-
-	return 0;
-}
-
diff --git a/examples/module/ftk_demo/demo_cairo.c b/examples/module/ftk_demo/demo_cairo.c
deleted file mode 100644
index aa1aa6fa24..0000000000
--- a/examples/module/ftk_demo/demo_cairo.c
+++ /dev/null
@@ -1,375 +0,0 @@
-#include <math.h>
-#ifdef ENABLE_CAIRO
-#include "ftk_cairo.h"
-
-static cairo_t* cr = NULL;
-
-static void paint_clip_image(int x, int y, int width, int height)
-{
-	int              w, h;
-	cairo_surface_t *image;
-	char filename[FTK_MAX_PATH+1] = {0};
-
-	cairo_translate (cr, x, y);
-	
-	cairo_arc (cr, width/2, height/4, width/3, 0, 2*M_PI);
-	cairo_clip (cr);
-	cairo_new_path (cr); /* path not consumed by clip()*/
-
-	ftk_snprintf(filename, FTK_MAX_PATH, "%s/png1.png", 
-		ftk_config_get_test_data_dir(ftk_default_config()));
-	image = cairo_image_surface_create_from_png (filename);
-
-	w = cairo_image_surface_get_width (image);
-	h = cairo_image_surface_get_height (image);
-
-//	cairo_scale (cr, 256.0/w, 256.0/h);
-
-	cairo_set_source_surface (cr, image, 0, 0);
-	cairo_paint (cr);
-
-	cairo_surface_destroy (image);
-
-	return;
-}
-
-static void paint_rect(int x, int y, int width, int height)
-{
-	/* a custom shape that could be wrapped in a function */
-	double x0      = 25.6,   /* parameters like cairo_rectangle */
-		   y0      = 25.6,
-		   rect_width  = 204.8,
-		   rect_height = 204.8,
-		   radius = 102.4;   /* and an approximate curvature radius */
-
-	double x1,y1;
-
-	cairo_translate (cr, x, y);
-	x1=x0+rect_width;
-	y1=y0+rect_height;
-	if (!rect_width || !rect_height)
-		return;
-	if (rect_width/2<radius) {
-		if (rect_height/2<radius) {
-			cairo_move_to  (cr, x0, (y0 + y1)/2);
-			cairo_curve_to (cr, x0 ,y0, x0, y0, (x0 + x1)/2, y0);
-			cairo_curve_to (cr, x1, y0, x1, y0, x1, (y0 + y1)/2);
-			cairo_curve_to (cr, x1, y1, x1, y1, (x1 + x0)/2, y1);
-			cairo_curve_to (cr, x0, y1, x0, y1, x0, (y0 + y1)/2);
-		} else {
-			cairo_move_to  (cr, x0, y0 + radius);
-			cairo_curve_to (cr, x0 ,y0, x0, y0, (x0 + x1)/2, y0);
-			cairo_curve_to (cr, x1, y0, x1, y0, x1, y0 + radius);
-			cairo_line_to (cr, x1 , y1 - radius);
-			cairo_curve_to (cr, x1, y1, x1, y1, (x1 + x0)/2, y1);
-			cairo_curve_to (cr, x0, y1, x0, y1, x0, y1- radius);
-		}
-	} else {
-		if (rect_height/2<radius) {
-			cairo_move_to  (cr, x0, (y0 + y1)/2);
-			cairo_curve_to (cr, x0 , y0, x0 , y0, x0 + radius, y0);
-			cairo_line_to (cr, x1 - radius, y0);
-			cairo_curve_to (cr, x1, y0, x1, y0, x1, (y0 + y1)/2);
-			cairo_curve_to (cr, x1, y1, x1, y1, x1 - radius, y1);
-			cairo_line_to (cr, x0 + radius, y1);
-			cairo_curve_to (cr, x0, y1, x0, y1, x0, (y0 + y1)/2);
-		} else {
-			cairo_move_to  (cr, x0, y0 + radius);
-			cairo_curve_to (cr, x0 , y0, x0 , y0, x0 + radius, y0);
-			cairo_line_to (cr, x1 - radius, y0);
-			cairo_curve_to (cr, x1, y0, x1, y0, x1, y0 + radius);
-			cairo_line_to (cr, x1 , y1 - radius);
-			cairo_curve_to (cr, x1, y1, x1, y1, x1 - radius, y1);
-			cairo_line_to (cr, x0 + radius, y1);
-			cairo_curve_to (cr, x0, y1, x0, y1, x0, y1- radius);
-		}
-	}
-	cairo_close_path (cr);
-
-	cairo_set_source_rgb (cr, 0.5, 0.5, 1);
-	cairo_fill_preserve (cr);
-	cairo_set_source_rgba (cr, 0.5, 0, 0, 0.5);
-	cairo_set_line_width (cr, 10.0);
-	cairo_stroke (cr);
-
-	return;
-}
-
-static void paint_pic(int x, int y, int width, int height)
-{
-	int              w, h;
-	cairo_surface_t *image;
-	cairo_pattern_t *pattern;
-	cairo_matrix_t   matrix;
-	char filename[FTK_MAX_PATH+1] = {0};
-
-	cairo_translate (cr, x, y);
-	ftk_snprintf(filename, FTK_MAX_PATH, "%s/png1.png", 
-		ftk_config_get_test_data_dir(ftk_default_config()));
-	image = cairo_image_surface_create_from_png (filename);
-
-	w = cairo_image_surface_get_width (image);
-	h = cairo_image_surface_get_height (image);
-
-	pattern = cairo_pattern_create_for_surface (image);
-	cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT);
-
-	cairo_translate (cr, 128.0, 128.0);
-	cairo_rotate (cr, M_PI / 4);
-	cairo_scale (cr, 1 / sqrt (2), 1 / sqrt (2));
-	cairo_translate (cr, -128.0, -128.0);
-
-	cairo_matrix_init_scale (&matrix, w/256.0 * 5.0, h/256.0 * 5.0);
-	cairo_pattern_set_matrix (pattern, &matrix);
-
-	cairo_set_source (cr, pattern);
-
-	cairo_rectangle (cr, 0, 0, 256.0, 256.0);
-	cairo_fill (cr);
-
-	cairo_pattern_destroy (pattern);
-	cairo_surface_destroy (image);
-
-	return;
-}
-
-static void paint_arrow(int x, int y, int width, int height)
-{
-	cairo_translate (cr, x, y);
-	cairo_set_line_width (cr, 40.96);
-	cairo_move_to (cr, 76.8, 84.48);
-	cairo_rel_line_to (cr, 51.2, -51.2);
-	cairo_rel_line_to (cr, 51.2, 51.2);
-	cairo_set_line_join (cr, CAIRO_LINE_JOIN_MITER); /* default */
-	cairo_stroke (cr);
-
-	cairo_move_to (cr, 76.8, 161.28);
-	cairo_rel_line_to (cr, 51.2, -51.2);
-	cairo_rel_line_to (cr, 51.2, 51.2);
-	cairo_set_line_join (cr, CAIRO_LINE_JOIN_BEVEL);
-	cairo_stroke (cr);
-
-	cairo_move_to (cr, 76.8, 238.08);
-	cairo_rel_line_to (cr, 51.2, -51.2);
-	cairo_rel_line_to (cr, 51.2, 51.2);
-	cairo_set_line_join (cr, CAIRO_LINE_JOIN_ROUND);
-	cairo_stroke (cr);
-
-	return;
-}
-
-static void paint_segments(int x, int y, int width, int height)
-{
-	cairo_translate (cr, x, y);
-	cairo_move_to (cr, 50.0, 75.0);
-	cairo_line_to (cr, 200.0, 75.0);
-
-	cairo_move_to (cr, 50.0, 125.0);
-	cairo_line_to (cr, 200.0, 125.0);
-
-	cairo_move_to (cr, 50.0, 175.0);
-	cairo_line_to (cr, 200.0, 175.0);
-
-	cairo_set_line_width (cr, 30.0);
-	cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
-	cairo_stroke (cr);
-
-	return;
-}
-
-static void paint_ball(int x, int y, int width, int height)
-{
-	cairo_pattern_t *pat;
-
-	pat = cairo_pattern_create_linear (0.0, 0.0,  0.0, height);
-	cairo_pattern_add_color_stop_rgba (pat, 1, 0, 0, 0, 1);
-	cairo_pattern_add_color_stop_rgba (pat, 0, 1, 1, 1, 1);
-	cairo_rectangle (cr, x, y, width, height);
-	cairo_set_source (cr, pat);
-	cairo_fill (cr);
-	cairo_pattern_destroy (pat);
-
-	pat = cairo_pattern_create_radial (x+115.2, y+102.4, 25.6,
-									   x+102.4,  y+102.4, 128.0);
-	cairo_pattern_add_color_stop_rgba (pat, 0, 1, 1, 1, 1);
-	cairo_pattern_add_color_stop_rgba (pat, 1, 0, 0, 0, 1);
-	cairo_set_source (cr, pat);
-	cairo_arc (cr, x+width/2, y+height/4, 76.8, 0, 2 * M_PI);
-	cairo_fill (cr);
-	cairo_pattern_destroy (pat);
-
-	return;
-}
-static void paint_helloworld(int x, int y, int width, int height)
-{
-	cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,
-								   CAIRO_FONT_WEIGHT_BOLD);
-	cairo_set_font_size (cr, 90.0);
-
-	cairo_move_to (cr, x+10.0, y+135.0);
-	cairo_show_text (cr, "Hello");
-
-	cairo_move_to (cr, x+70.0, y+165.0);
-	cairo_text_path (cr, "void");
-	cairo_set_source_rgb (cr, 0.5, 0.5, 1);
-	cairo_fill_preserve (cr);
-	cairo_set_source_rgb (cr, 0, 0, 0);
-	cairo_set_line_width (cr, 2.56);
-	cairo_stroke (cr);
-
-	/* draw helping lines */
-	cairo_set_source_rgba (cr, 1, 0.2, 0.2, 0.6);
-	cairo_arc (cr, x+10.0, y+135.0, 5.12, 0, 2*M_PI);
-	cairo_close_path (cr);
-	cairo_arc (cr, x+70.0, y+165.0, 5.12, 0, 2*M_PI);
-	cairo_fill (cr);
-
-	return;
-}
-
-static void paint_car(int x, int y, int width, int height)
-{
-	cairo_set_line_width (cr, 6);
-	cairo_rectangle (cr, x+10, y+10, width-20, 70);
-	cairo_new_sub_path (cr); cairo_arc (cr, x+64, y+64, 40, 0, 2*M_PI);
-	cairo_new_sub_path (cr); cairo_arc_negative (cr, width-64, y+64, 40, 0, -2*M_PI);
-
-	cairo_set_fill_rule (cr, CAIRO_FILL_RULE_EVEN_ODD);
-	cairo_set_source_rgb (cr, 0, 0.7, 0); cairo_fill_preserve (cr);
-	cairo_set_source_rgb (cr, 0, 0, 0); cairo_stroke (cr);
-
-	cairo_translate (cr, x, height/2);
-	cairo_rectangle (cr, 10, 10, width-20, 70);
-	cairo_new_sub_path (cr); cairo_arc (cr, 64, 64, 40, 0, 2*M_PI);
-	cairo_new_sub_path (cr); cairo_arc_negative (cr, width-64, 64, 40, 0, -2*M_PI);
-
-	cairo_set_fill_rule (cr, CAIRO_FILL_RULE_WINDING);
-	cairo_set_source_rgb (cr, 0, 0, 0.9); cairo_fill_preserve (cr);
-	cairo_set_source_rgb (cr, 0, 0, 0); cairo_stroke (cr);
-
-	return;
-}
-
-typedef void (*PaintFunc)(int x, int y, int width, int height);
-
-static size_t g_index = 0;
-
-static const PaintFunc paints[] = 
-{
-	paint_car,
-	paint_helloworld,
-	paint_ball,
-	paint_segments,
-	paint_arrow,
-	paint_pic,
-	paint_rect,
-	paint_clip_image
-};
-
-static Ret on_paint(void* ctx, void* obj)
-{
-	FtkWidget* thiz = obj;
-	FTK_BEGIN_PAINT(x, y, width, height, canvas);
-
-	ftk_logd("%s:%d\n", __func__, __LINE__);
-	if(cr == NULL)
-	{
-		cairo_surface_t* surface = ftk_cairo_surface_create(thiz);
-		cr = cairo_create(surface);
-		cairo_surface_destroy(surface);
-	ftk_logd("%s:%d\n", __func__, __LINE__);
-	}
-	
-	cairo_save (cr);
-	cairo_reset_clip (cr);
-	cairo_identity_matrix (cr);
-	cairo_new_path (cr);
-	cairo_rectangle(cr, x, y, width, height);
-	cairo_clip (cr);
-
-	ftk_logd("%s:%d\n", __func__, __LINE__);
-	paints[g_index](x, y, width, height);
-	ftk_logd("%s:%d\n", __func__, __LINE__);
-
-	cairo_restore (cr);
-	
-	FTK_END_PAINT();
-	ftk_logd("%s:%d\n", __func__, __LINE__);
-
-	return RET_OK;
-}
-
-static Ret button_prev_clicked(void* ctx, void* obj)
-{
-	g_index = g_index > 0 ? g_index - 1 : 0;
-	ftk_widget_invalidate(ftk_widget_lookup(ctx, 100));
-
-	return RET_OK;
-}
-
-static Ret button_next_clicked(void* ctx, void* obj)
-{
-	g_index++;
-	g_index = g_index % (sizeof(paints)/sizeof(paints[0]));
-
-	ftk_widget_invalidate(ftk_widget_lookup(ctx, 100));
-
-	return RET_OK;
-}
-
-static Ret button_quit_clicked(void* ctx, void* obj)
-{
-	ftk_widget_unref(ctx);
-
-	return RET_OK;
-}
-
-#ifdef FTK_AS_PLUGIN
-#include "ftk_app_demo.h"
-FTK_HIDE int FTK_MAIN(int argc, char* argv[]);
-FtkApp* ftk_app_demo_cairo_create()
-{
-	return ftk_app_demo_create(_("cairo"), ftk_main);
-}
-#else
-#define FTK_HIDE extern
-#endif /*FTK_AS_PLUGIN*/
-
-FTK_HIDE int FTK_MAIN(int argc, char* argv[])
-{
-	int width = 0;
-	int height = 0;
-	FtkWidget* win = NULL;
-	FtkWidget* button = NULL;
-	FtkWidget* painter = NULL;
-	FTK_INIT(argc, argv);
-
-	win = ftk_app_window_create();
-	width = ftk_widget_width(win);
-	height = ftk_widget_height(win);
-
-	button = ftk_button_create(win, 0, 10, width/3, 60);
-	ftk_widget_set_text(button, "prev");
-	ftk_button_set_clicked_listener(button, button_prev_clicked, win);
-
-	button = ftk_button_create(win, width/3, 10, width/3, 60);
-	ftk_widget_set_text(button, "next");
-	ftk_button_set_clicked_listener(button, button_next_clicked, win);
-
-	button = ftk_button_create(win, width*2/3, 10, width/3, 60);
-	ftk_widget_set_text(button, "quit");
-	ftk_button_set_clicked_listener(button, button_quit_clicked, win);
-
-	painter = ftk_painter_create(win, 0, 70, width, height);
-	ftk_widget_set_id(painter, 100);
-	ftk_painter_set_paint_listener(painter, on_paint, NULL);
-
-	ftk_widget_set_text(win, "cairo demo");
-	ftk_widget_show_all(win, 1);
-	FTK_QUIT_WHEN_WIDGET_CLOSE(win);
-
-	FTK_RUN();
-
-	return 0;
-}
-#endif