From 7a7e223d152b42553f7e6ce0220dd5d736b89c56 Mon Sep 17 00:00:00 2001 From: inmarket Date: Thu, 24 Oct 2013 18:36:11 +1000 Subject: Add multiple display support to GWIN. You can now create windows on multiple displays. --- include/gwin/gwin.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'include/gwin/gwin.h') diff --git a/include/gwin/gwin.h b/include/gwin/gwin.h index 372ece9c..37a14fa1 100644 --- a/include/gwin/gwin.h +++ b/include/gwin/gwin.h @@ -38,6 +38,7 @@ typedef struct GWindowObject { gfxQueueASyncItem wmq; // @< The next window (for the window manager) #endif const struct gwinVMT *vmt; // @< The VMT for this GWIN + GDisplay * display; // @< The display this window is on. coord_t x, y; // @< Screen relative position coord_t width, height; // @< Dimensions of this window color_t color, bgcolor; // @< The current drawing colors @@ -165,6 +166,7 @@ extern "C" { * @brief Create a basic window. * @return NULL if there is no resultant drawing area, otherwise a window handle. * + * @param[in] g The GDisplay to display this window on * @param[in] pgw The window structure to initialize. If this is NULL the structure is dynamically allocated. * @param[in] pInit How to initialise the window * @@ -177,7 +179,8 @@ extern "C" { * * @api */ - GHandle gwinWindowCreate(GWindowObject *pgw, const GWindowInit *pInit); + GHandle gwinGWindowCreate(GDisplay *g, GWindowObject *pgw, const GWindowInit *pInit); + #define gwinWindowCreate(pgw, pInit) gwinGWindowCreate(GDISP, pgw, pInit); /** * @brief Destroy a window (of any type). Releases any dynamically allocated memory. -- cgit v1.2.3 From 7c3b7270fc1b39bf231654b846bcaeccead4413c Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Sun, 27 Oct 2013 16:39:42 +0100 Subject: moved include headers to correct location --- include/gwin/gwin.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'include/gwin/gwin.h') diff --git a/include/gwin/gwin.h b/include/gwin/gwin.h index 37a14fa1..fa5ba613 100644 --- a/include/gwin/gwin.h +++ b/include/gwin/gwin.h @@ -823,14 +823,6 @@ extern "C" { #include "gwin/image.h" #endif - #if GWIN_NEED_LABEL || defined(__DOXYGEN__) - #include "gwin/label.h" - #endif - - #if GWIN_NEED_LIST || defined(__DOXYGEN__) - #include "gwin/list.h" - #endif - #endif /* GFX_USE_GWIN */ #endif /* _GWIN_H */ -- cgit v1.2.3