aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorpashamray <pashamray@gmail.com>2014-07-05 20:41:19 +0300
committerpashamray <pashamray@gmail.com>2014-07-05 20:41:19 +0300
commit6994219998b70d55f3769041fd4e323a12be6552 (patch)
treeeb41a79d6f8ca0aa569fbb33e7f9badfef425636 /src
parent5dba30b0a8e6c7a171784b18019974336ab633a8 (diff)
parenta675812b08fa9b86c841762441b4ed4060ff4aa0 (diff)
downloaduGFX-6994219998b70d55f3769041fd4e323a12be6552.tar.gz
uGFX-6994219998b70d55f3769041fd4e323a12be6552.tar.bz2
uGFX-6994219998b70d55f3769041fd4e323a12be6552.zip
Tectu/ugfx слито с master
Diffstat (limited to 'src')
-rw-r--r--src/gfile/sys_defs.h2
-rw-r--r--src/gwin/frame.h5
-rw-r--r--src/gwin/gimage.h2
3 files changed, 4 insertions, 5 deletions
diff --git a/src/gfile/sys_defs.h b/src/gfile/sys_defs.h
index 4280f7fe..0c5bac0c 100644
--- a/src/gfile/sys_defs.h
+++ b/src/gfile/sys_defs.h
@@ -73,7 +73,7 @@ extern "C" {
/**
* @brief Get the size of a file
- * @note Please use @p gfileGetSize() if the file is not opened
+ * @note Please use @p gfileGetSize() if the file is opened
*
* @param[in] fname The file name
*
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