diff options
author | inmarket <andrewh@inmarket.com.au> | 2014-08-20 12:18:27 +1000 |
---|---|---|
committer | inmarket <andrewh@inmarket.com.au> | 2014-08-20 12:18:27 +1000 |
commit | ecaf8b83f8227724e9f862a0a8f64e6004a63d56 (patch) | |
tree | ed84213400a1f7e338e5bb79eb5fec11152e24d1 /src/gwin/button.c | |
parent | 3b21507274aa4f98644382903ae529c1fc2c7bd4 (diff) | |
download | uGFX-ecaf8b83f8227724e9f862a0a8f64e6004a63d56.tar.gz uGFX-ecaf8b83f8227724e9f862a0a8f64e6004a63d56.tar.bz2 uGFX-ecaf8b83f8227724e9f862a0a8f64e6004a63d56.zip |
Create a generic GWIN event.
The frame now sends a GEVENT_GWIN_CLOSE event on closing.
Unfortunately some gwin events have had a field renamed in order to generalise the structure.
Demo's updated to match.
Diffstat (limited to 'src/gwin/button.c')
-rw-r--r-- | src/gwin/button.c | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/src/gwin/button.c b/src/gwin/button.c index fc1cb976..5507a07a 100644 --- a/src/gwin/button.c +++ b/src/gwin/button.c @@ -26,28 +26,6 @@ // Our pressed state #define GBUTTON_FLG_PRESSED (GWIN_FIRST_CONTROL_FLAG<<0) -// Send the button event -static void SendButtonEvent(GWidgetObject *gw) { - GSourceListener * psl; - GEvent * pe; - #define pbe ((GEventGWinButton *)pe) - - // Trigger a GWIN Button Event - psl = 0; - while ((psl = geventGetSourceListener(GWIDGET_SOURCE, psl))) { - if (!(pe = geventGetEventBuffer(psl))) - continue; - pbe->type = GEVENT_GWIN_BUTTON; - pbe->button = (GHandle)gw; - #if GWIN_WIDGET_TAGS - pbe->tag = gw->tag; - #endif - geventSendEvent(psl); - } - - #undef pbe -} - #if GINPUT_NEED_MOUSE // A mouse down has occurred over the button static void MouseDown(GWidgetObject *gw, coord_t x, coord_t y) { @@ -68,7 +46,7 @@ static void SendButtonEvent(GWidgetObject *gw) { return; #endif - SendButtonEvent(gw); + _gwinSendEvent(&gw->g, GEVENT_GWIN_BUTTON); } #endif @@ -86,7 +64,7 @@ static void SendButtonEvent(GWidgetObject *gw) { gw->g.flags |= GBUTTON_FLG_PRESSED; _gwinUpdate((GHandle)gw); // Trigger the event on button down (different than for mouse/touch) - SendButtonEvent(gw); + _gwinSendEvent(&gw->g, GEVENT_GWIN_BUTTON); } static void ToggleAssign(GWidgetObject *gw, uint16_t role, uint16_t instance) { |