diff options
| author | root <root@ps-pc.(none)> | 2014-07-06 13:57:56 +0300 |
|---|---|---|
| committer | root <root@ps-pc.(none)> | 2014-07-06 13:57:56 +0300 |
| commit | 294576c2c4f1d28616703c2d29d81c31ace570c7 (patch) | |
| tree | a8667d234fee82c316958128a48219a00436f920 /src/gwin | |
| parent | 71892bf7616cfd3289e728b9034f286681dfccab (diff) | |
| parent | feec298beba4fa7bbf4f068dda6b0d6ba1b63f61 (diff) | |
| download | uGFX-294576c2c4f1d28616703c2d29d81c31ace570c7.tar.gz uGFX-294576c2c4f1d28616703c2d29d81c31ace570c7.tar.bz2 uGFX-294576c2c4f1d28616703c2d29d81c31ace570c7.zip | |
Merge branch 'pcf8812' of https://bitbucket.org/pashamray/ugfx into pcf8812
Diffstat (limited to 'src/gwin')
| -rw-r--r-- | src/gwin/frame.h | 5 | ||||
| -rw-r--r-- | src/gwin/gimage.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/gwin/frame.h b/src/gwin/frame.h index bf7cd2d8..fc5daf8e 100644 --- a/src/gwin/frame.h +++ b/src/gwin/frame.h @@ -45,8 +45,7 @@ typedef struct GFrameObject { /** * @brief Create a frame widget * - * @details This widget provides a window like we know it from desktop systems. You usually use this together with - * gwinAddChild(). + * @details This widget provides a window like we know it from desktop systems. * * @param[in] g The GDisplay to display this window on * @param[in] fo The GFrameObject structure to initialize. If this is NULL the structure is dynamically allocated. @@ -54,7 +53,7 @@ typedef struct GFrameObject { * @param[in] flags Some flags, see notes. * * @note Possible flags are: GWIN_FRAME_BORDER, GWIN_FRAME_CLOSE_BTN, GWIN_FRAME_MINMAX_BTN. - * Whether the close or the minimize maximize buttons are used, the boarder is automatically invoked. + * When the close or the minimize/maximize buttons are used, the boarder is automatically invoked. * @note These frame buttons are processed internally. The close button will invoke a gwinDestroy() which will * destroy the window itself and EVERY child it contains (also children of children). * diff --git a/src/gwin/gimage.h b/src/gwin/gimage.h index 670a9ec4..0052f024 100644 --- a/src/gwin/gimage.h +++ b/src/gwin/gimage.h @@ -9,7 +9,7 @@ * @file src/gwin/gimage.h * @brief GWIN image widget header file. * - * @defgroup Image Image + * @defgroup ImageBox ImageBox * @ingroup Widgets * * @details GWIN allos it to create an image widget. The widget |