diff options
| author | bernard.xiong <[email protected]> | 2010-02-12 16:02:00 +0000 |
|---|---|---|
| committer | bernard.xiong <[email protected]> | 2010-02-12 16:02:00 +0000 |
| commit | 49e090149a37d6a011cb25959530ef931289402a (patch) | |
| tree | 3906ffc5817ba62bde1c9f43fa2154f6de9ee940 /rtgui/include | |
| parent | 3c831420de91906a829effacef83decfdb367035 (diff) | |
improve radio box drawing; fix focus issue; fix modal showing; add mouse support on list and file list view.
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@409 bbd45198-f89e-11dd-88c7-29a3b14d5316
Diffstat (limited to 'rtgui/include')
| -rw-r--r-- | rtgui/include/rtgui/rtgui_config.h | 13 | ||||
| -rw-r--r-- | rtgui/include/rtgui/rtgui_theme.h | 6 | ||||
| -rw-r--r-- | rtgui/include/rtgui/widgets/window.h | 5 | ||||
| -rw-r--r-- | rtgui/include/rtgui/widgets/workbench.h | 3 |
4 files changed, 26 insertions, 1 deletions
diff --git a/rtgui/include/rtgui/rtgui_config.h b/rtgui/include/rtgui/rtgui_config.h index 311007d71e..a941ad6422 100644 --- a/rtgui/include/rtgui/rtgui_config.h +++ b/rtgui/include/rtgui/rtgui_config.h @@ -19,6 +19,19 @@ /* RTGUI options */
#ifdef _WIN32
+/* name length of RTGUI object */
+#define RTGUI_NAME_MAX 12
+/* support 16 weight font */
+#define RTGUI_USING_FONT16
+/* support Chinese font */
+#define RTGUI_USING_FONTHZ
+/* use small size in RTGUI */
+#define RTGUI_USING_SMALL_SIZE
+/* use mouse cursor */
+/* #define RTGUI_USING_MOUSE_CURSOR */
+/* default font size in RTGUI */
+#define RTGUI_DEFAULT_FONT_SIZE 12
+
#define RTGUI_USING_STDIO_FILERW
#define RTGUI_IMAGE_PNG
#define RTGUI_IMAGE_JPEG
diff --git a/rtgui/include/rtgui/rtgui_theme.h b/rtgui/include/rtgui/rtgui_theme.h index 979e1cb254..20912149bd 100644 --- a/rtgui/include/rtgui/rtgui_theme.h +++ b/rtgui/include/rtgui/rtgui_theme.h @@ -17,6 +17,12 @@ #include <rtgui/rtgui.h>
#include <rtgui/rtgui_server.h>
+#define CHECK_BOX_W 13
+#define CHECK_BOX_H 13
+
+#define RADIO_BOX_W 12
+#define RADIO_BOX_H 12
+
#include <rtgui/widgets/label.h>
#include <rtgui/widgets/button.h>
#include <rtgui/widgets/textbox.h>
diff --git a/rtgui/include/rtgui/widgets/window.h b/rtgui/include/rtgui/widgets/window.h index ea730580ad..75c53eb69b 100644 --- a/rtgui/include/rtgui/widgets/window.h +++ b/rtgui/include/rtgui/widgets/window.h @@ -52,7 +52,10 @@ struct rtgui_win /* top window style */
rt_uint8_t style;
+
+ rt_uint8_t flag;
rtgui_modal_code_t modal_code;
+ rtgui_widget_t* modal_widget;
/* window title */
char* title;
@@ -69,7 +72,7 @@ struct rtgui_win rtgui_type_t *rtgui_win_type_get(void);
rtgui_win_t* rtgui_win_create(rtgui_toplevel_t* parent_toplevel, const char* title,
- rtgui_rect_t *rect, rt_uint32_t flag);
+ rtgui_rect_t *rect, rt_uint8_t flag);
void rtgui_win_destroy(rtgui_win_t* win);
rtgui_modal_code_t rtgui_win_show(rtgui_win_t* win, rt_bool_t is_modal);
diff --git a/rtgui/include/rtgui/widgets/workbench.h b/rtgui/include/rtgui/widgets/workbench.h index 3d8668083a..ba863f080e 100644 --- a/rtgui/include/rtgui/widgets/workbench.h +++ b/rtgui/include/rtgui/widgets/workbench.h @@ -33,6 +33,8 @@ #define RTGUI_WORKBENCH_FLAG_DEFAULT RTGUI_WORKBENCH_FLAG_VISIBLE | RTGUI_WORKBENCH_FLAG_CLOSEBLE
+#define RTGUI_WORKBENCH_IS_MODAL_MODE(w) ((w)->flag & RTGUI_WORKBENCH_FLAG_MODAL_MODE)
+
/** Gets the type of a workbench */
#define RTGUI_WORKBENCH_TYPE (rtgui_workbench_type_get())
/** Casts the object to an rtgui_workbench */
@@ -51,6 +53,7 @@ struct rtgui_workbench /* workbench flag */
rt_uint8_t flag;
rtgui_modal_code_t modal_code;
+ rtgui_widget_t *modal_widget;
/* workbench title */
unsigned char* title;
|