diff options
| author | Joel Bodenmann <joel@seriouslyembedded.com> | 2015-10-21 14:37:42 +0200 |
|---|---|---|
| committer | Joel Bodenmann <joel@seriouslyembedded.com> | 2015-10-21 14:37:42 +0200 |
| commit | 29251f33bd106cfdc317fa00c10ecfb3a64fcc2d (patch) | |
| tree | d4a5b60de91b4116895dc542c017454711d03bc4 /src/gwin | |
| parent | 9a1d2e43e50da99b924b281e91c03a7e96b02b73 (diff) | |
| parent | 506355309e5bb88885ae8e449ea1fc905d98a54a (diff) | |
| download | uGFX-29251f33bd106cfdc317fa00c10ecfb3a64fcc2d.tar.gz uGFX-29251f33bd106cfdc317fa00c10ecfb3a64fcc2d.tar.bz2 uGFX-29251f33bd106cfdc317fa00c10ecfb3a64fcc2d.zip | |
Merge branch 'master' into Keil
Diffstat (limited to 'src/gwin')
| -rw-r--r-- | src/gwin/gwin.c | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/src/gwin/gwin.c b/src/gwin/gwin.c index 5879e895..07beb996 100644 --- a/src/gwin/gwin.c +++ b/src/gwin/gwin.c @@ -36,6 +36,18 @@ static color_t defaultBgColor = Black; static font_t defaultFont; #endif +/* These init functions are defined by each module but not published */ +extern void _gwmInit(void); +extern void _gwmDeinit(void); +#if GWIN_NEED_WIDGET + extern void _gwidgetInit(void); + extern void _gwidgetDeinit(void); +#endif +#if GWIN_NEED_CONTAINERS + extern void _gcontainerInit(void); + extern void _gcontainerDeinit(void); +#endif + /*----------------------------------------------- * Helper Routines *-----------------------------------------------*/ @@ -46,33 +58,24 @@ static color_t defaultBgColor = Black; void _gwinInit(void) { - extern void _gwmInit(void); - _gwmInit(); - #if GWIN_NEED_WIDGET - extern void _gwidgetInit(void); + #if GWIN_NEED_WIDGET _gwidgetInit(); #endif - #if GWIN_NEED_CONTAINERS - extern void _gcontainerInit(void); + #if GWIN_NEED_CONTAINERS _gcontainerInit(); #endif } void _gwinDeinit(void) { - extern void _gwmDeinit(void); - #if GWIN_NEED_CONTAINERS - extern void _gcontainerDeinit(void); - _gcontainerDeinit(); #endif - #if GWIN_NEED_WIDGET - extern void _gwidgetDeinit(void); + #if GWIN_NEED_WIDGET _gwidgetDeinit(); #endif |