From d06ac4f86c99310ddb2521764c9c5efbf466ec65 Mon Sep 17 00:00:00 2001 From: "bernard.xiong" Date: Thu, 14 Jan 2010 10:03:50 +0000 Subject: add jpg image. git-svn-id: https://rt-thread.googlecode.com/svn/trunk@303 bbd45198-f89e-11dd-88c7-29a3b14d5316 --- rtgui/include/rtgui/image_jpeg.h | 8 +++++ rtgui/include/rtgui/rtgui_config.h | 2 +- rtgui/include/rtgui/rtgui_system.h | 1 - rtgui/include/rtgui/widgets/listbox.h | 66 ----------------------------------- 4 files changed, 9 insertions(+), 68 deletions(-) create mode 100644 rtgui/include/rtgui/image_jpeg.h delete mode 100644 rtgui/include/rtgui/widgets/listbox.h (limited to 'rtgui/include') diff --git a/rtgui/include/rtgui/image_jpeg.h b/rtgui/include/rtgui/image_jpeg.h new file mode 100644 index 0000000000..48e88e701d --- /dev/null +++ b/rtgui/include/rtgui/image_jpeg.h @@ -0,0 +1,8 @@ +#ifndef __RTGUI_IMAGE_JPEG_H__ +#define __RTGUI_IMAGE_JPEG_H__ + +#include + +void rtgui_image_jpeg_init(void); + +#endif diff --git a/rtgui/include/rtgui/rtgui_config.h b/rtgui/include/rtgui/rtgui_config.h index 54f9266b4b..70cbeabff8 100644 --- a/rtgui/include/rtgui/rtgui_config.h +++ b/rtgui/include/rtgui/rtgui_config.h @@ -36,7 +36,7 @@ #define RTGUI_USING_HZ_FILE #endif -#define RTGUI_USING_SMALL_SIZE +// #define RTGUI_USING_SMALL_SIZE #define RTGUI_SVR_THREAD_PRIORITY 15 #define RTGUI_SVR_THREAD_TIMESLICE 5 diff --git a/rtgui/include/rtgui/rtgui_system.h b/rtgui/include/rtgui/rtgui_system.h index e0ceae6f2b..a1368f118f 100644 --- a/rtgui/include/rtgui/rtgui_system.h +++ b/rtgui/include/rtgui/rtgui_system.h @@ -73,7 +73,6 @@ rt_err_t rtgui_thread_ack(struct rtgui_event* event, rt_int32_t status); /* rtgui system initialization function */ void rtgui_system_server_init(void); -void rtgui_system_app_init(void); void* rtgui_malloc(rt_size_t size); void rtgui_free(void* ptr); diff --git a/rtgui/include/rtgui/widgets/listbox.h b/rtgui/include/rtgui/widgets/listbox.h deleted file mode 100644 index 1c201301da..0000000000 --- a/rtgui/include/rtgui/widgets/listbox.h +++ /dev/null @@ -1,66 +0,0 @@ -/* - * File : listbox.h - * This file is part of RT-Thread RTOS - * COPYRIGHT (C) 2006 - 2009, RT-Thread Development Team - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rt-thread.org/license/LICENSE - * - * Change Logs: - * Date Author Notes - * 2009-10-16 Bernard first version - */ -#ifndef __RTGUI_LISTBOX_H__ -#define __RTGUI_LISTBOX_H__ - -#include -#include - -#define RTGUI_LISTBOX_WIDTH 150 -#define RTGUI_LISTBOX_HEIGHT 200 - -/** Gets the type of a listbox */ -#define RTGUI_LISTBOX_TYPE (rtgui_listbox_type_get()) -/** Casts the object to a rtgui_listbox */ -#define RTGUI_LISTBOX(obj) (RTGUI_OBJECT_CAST((obj), RTGUI_LISTBOX_TYPE, rtgui_listbox_t)) -/** Checks if the object is a rtgui_listbox */ -#define RTGUI_IS_LISTBOX(obj) (RTGUI_OBJECT_CHECK_TYPE((obj), RTGUI_LISTBOX_TYPE)) - -/* -* the listbox widget -*/ -struct rtgui_listbox -{ - struct rtgui_scrollview parent; - - /* widget private data */ - int flag; - - /* total number of items */ - rt_uint32_t count; - - /* the selected item */ - struct rtgui_item* selected; - - /* call back */ - rt_bool_t (*on_selected) (struct rtgui_widget* widget, struct rtgui_event* event); - rt_bool_t (*on_activated) (struct rtgui_widget* widget, struct rtgui_event* event); -}; -typedef struct rtgui_listbox rtgui_listbox_t; - -rtgui_type_t *rtgui_listbox_type_get(void); - -rtgui_listbox_t* rtgui_listbox_create(void); -void rtgui_listbox_destroy(rtgui_listbox_t* listbox); - -rt_bool_t rtgui_listbox_event_handler(struct rtgui_widget* widget, struct rtgui_event* event); - -struct rtgui_item* rtgui_listbox_get_select(struct rtgui_listbox* box); -void rtgui_listbox_set_select(struct rtgui_listbox* box, rt_uint32_t index); -void rtgui_listbox_set_select_item(struct rtgui_listbox* box, struct rtgui_item* item); - -struct rtgui_item* rtgui_listbox_add_item_string(struct rtgui_listbox* box, const unsigned char* text); -void rtgui_listbox_add_item(struct rtgui_listbox* list, struct rtgui_item* item); - -#endif -- cgit v1.3.1