diff options
| -rw-r--r-- | examples/gui/demo_listview.c | 10 | ||||
| -rw-r--r-- | examples/gui/demo_listview_icon.c | 8 | ||||
| -rw-r--r-- | examples/gui/demo_view_buffer_animation.c | 2 | ||||
| -rw-r--r-- | examples/gui/demo_workbench.c | 8 |
4 files changed, 26 insertions, 2 deletions
diff --git a/examples/gui/demo_listview.c b/examples/gui/demo_listview.c index 079960defb..791852026a 100644 --- a/examples/gui/demo_listview.c +++ b/examples/gui/demo_listview.c @@ -12,10 +12,14 @@ static rtgui_workbench_t* workbench = RT_NULL;
static rtgui_list_view_t* _view = RT_NULL;
-static rtgui_image_t* return_image = RT_NULL;
+// static rtgui_image_t* return_image = RT_NULL;
/* �б���Ķ������� */
+#if RT_VERSION == 4
static void listitem_action(rtgui_widget_t *widget, void* parameter)
+#else
+static void listitem_action(void* parameter)
+#endif
{
char label_text[32];
rtgui_win_t *win;
@@ -46,7 +50,11 @@ static void listitem_action(rtgui_widget_t *widget, void* parameter) }
/* ���ع��ܵĶ������� */
+#if RT_VERSION == 4
static void return_action(rtgui_widget_t* widget, void* parameter)
+#else
+static void return_action(void* parameter)
+#endif
{
rtgui_view_end_modal(RTGUI_VIEW(_view), RTGUI_MODAL_OK);
}
diff --git a/examples/gui/demo_listview_icon.c b/examples/gui/demo_listview_icon.c index d0e57d85e3..b6e2986287 100644 --- a/examples/gui/demo_listview_icon.c +++ b/examples/gui/demo_listview_icon.c @@ -14,7 +14,11 @@ static rtgui_workbench_t* workbench = RT_NULL; static rtgui_list_view_t* _view = RT_NULL;
/* �б���Ķ������� */
+#if RT_VERSION == 4
static void listitem_action(rtgui_widget_t* widget, void* parameter)
+#else
+static void listitem_action(void* parameter)
+#endif
{
char label_text[32];
rtgui_win_t *win;
@@ -45,7 +49,11 @@ static void listitem_action(rtgui_widget_t* widget, void* parameter) }
/* ���ع��ܵĶ������� */
+#if RT_VERSION == 4
static void return_action(rtgui_widget_t* widget, void* parameter)
+#else
+static void return_action(void* parameter)
+#endif
{
/* �˳�ģ̬��ʾ */
rtgui_view_end_modal(RTGUI_VIEW(_view), RTGUI_MODAL_OK);
diff --git a/examples/gui/demo_view_buffer_animation.c b/examples/gui/demo_view_buffer_animation.c index de55f25ebf..2e8cc5ce3a 100644 --- a/examples/gui/demo_view_buffer_animation.c +++ b/examples/gui/demo_view_buffer_animation.c @@ -117,7 +117,7 @@ rtgui_view_t *demo_view_buffer_animation(rtgui_workbench_t* workbench) }
/* ������ʱ���Դ������� */
- timer = rtgui_timer_create(2, RT_TIMER_FLAG_PERIODIC, timeout, (void*)view);
+ timer = rtgui_timer_create(1, RT_TIMER_FLAG_PERIODIC, timeout, (void*)view);
rtgui_timer_start(timer);
return view;
diff --git a/examples/gui/demo_workbench.c b/examples/gui/demo_workbench.c index d628f4fe51..6569d475b5 100644 --- a/examples/gui/demo_workbench.c +++ b/examples/gui/demo_workbench.c @@ -51,11 +51,17 @@ static void workbench_entry(void* parameter) rtgui_widget_set_event_handler(RTGUI_WIDGET(workbench), demo_workbench_event_handler); /* 初始化各个例子的视图 */ +#if RT_VERSION == 4 demo_view_benchmark(workbench); +#endif + demo_view_dc(workbench); +#if RT_VERSION == 4 #ifdef RTGUI_USING_TTF demo_view_ttf(workbench); #endif +#endif + demo_view_dc_buffer(workbench); demo_view_animation(workbench); demo_view_buffer_animation(workbench); @@ -64,7 +70,9 @@ static void workbench_entry(void* parameter) demo_view_button(workbench); demo_view_checkbox(workbench); demo_view_progressbar(workbench); +#if RT_VERSION == 4 demo_view_scrollbar(workbench); +#endif demo_view_radiobox(workbench); demo_view_textbox(workbench); demo_view_listbox(workbench); |