Reorder initialisation to ensure gwin is initialised last

ugfx_release_2.6
inmarket 2014-09-26 16:28:26 +10:00
parent 8410c8c8b5
commit 8b1666e72f
1 changed files with 6 additions and 6 deletions

View File

@ -89,9 +89,6 @@ void gfxInit(void)
#if GFX_USE_GDISP #if GFX_USE_GDISP
_gdispInit(); _gdispInit();
#endif #endif
#if GFX_USE_GWIN
_gwinInit();
#endif
#if GFX_USE_GINPUT #if GFX_USE_GINPUT
_ginputInit(); _ginputInit();
#endif #endif
@ -101,6 +98,9 @@ void gfxInit(void)
#if GFX_USE_GAUDIO #if GFX_USE_GAUDIO
_gaudioInit(); _gaudioInit();
#endif #endif
#if GFX_USE_GWIN
_gwinInit();
#endif
} }
void gfxDeinit(void) void gfxDeinit(void)
@ -110,6 +110,9 @@ void gfxDeinit(void)
initDone = FALSE; initDone = FALSE;
// We deinitialise the opposite way as we initialised // We deinitialise the opposite way as we initialised
#if GFX_USE_GWIN
_gwinDeinit();
#endif
#if GFX_USE_GAUDIN #if GFX_USE_GAUDIN
_gaudioDeinit(); _gaudioDeinit();
#endif #endif
@ -119,9 +122,6 @@ void gfxDeinit(void)
#if GFX_USE_GINPUT #if GFX_USE_GINPUT
_ginputDeinit(); _ginputDeinit();
#endif #endif
#if GFX_USE_GWIN
_gwinDeinit();
#endif
#if GFX_USE_GDISP #if GFX_USE_GDISP
_gdispDeinit(); _gdispDeinit();
#endif #endif