diff options
author | inmarket <andrewh@inmarket.com.au> | 2014-09-29 15:47:47 +1000 |
---|---|---|
committer | inmarket <andrewh@inmarket.com.au> | 2014-09-29 15:47:47 +1000 |
commit | 611133cbc0d55f9dd570cfbccbe432ccc63a12aa (patch) | |
tree | fb49a0cfde803a6c23e9b0b350675f33e29c2b0d /src/gwin/gwin_progressbar.h | |
parent | 0253b7df4967b3fee54d9d9a1e588e6da8cd687d (diff) | |
parent | e2f3a68c3b9b97799ac446fa5c0bc8bfdf9d9012 (diff) | |
download | uGFX-611133cbc0d55f9dd570cfbccbe432ccc63a12aa.tar.gz uGFX-611133cbc0d55f9dd570cfbccbe432ccc63a12aa.tar.bz2 uGFX-611133cbc0d55f9dd570cfbccbe432ccc63a12aa.zip |
Merge branch 'master' into newmouse
Diffstat (limited to 'src/gwin/gwin_progressbar.h')
-rw-r--r-- | src/gwin/gwin_progressbar.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/gwin/gwin_progressbar.h b/src/gwin/gwin_progressbar.h index 49c11a98..dae9d40a 100644 --- a/src/gwin/gwin_progressbar.h +++ b/src/gwin/gwin_progressbar.h @@ -33,7 +33,6 @@ typedef struct GProgressbarObject { int pos; #if GWIN_PROGRESSBAR_AUTO GTimer gt; - delaytime_t delay; #endif } GProgressbarObject; @@ -59,7 +58,7 @@ extern "C" { * @note A progressbar does not take any GINPUT inputs. * * @api - */ + */ GHandle gwinGProgressbarCreate(GDisplay *g, GProgressbarObject *gb, const GWidgetInit *pInit); #define gwinProgressbarCreate(w, pInit) gwinGProgressbarCreate(GDISP, w, pInit) @@ -165,14 +164,14 @@ void gwinProgressbarDecrement(GHandle gh); * @api */ void gwinProgressbarStart(GHandle gh, delaytime_t delay); - + /** * @brief Stop the timer which is started by @p gwinProgressbarStart() * * @param[in] gh The window handle (must be a progressbar window) * * @api - */ + */ void gwinProgressbarStop(GHandle gh); #endif /* GWIN_PROGRESSBAR_AUTO */ |