diff options
| author | Joel Bodenmann <joel@unormal.org> | 2014-05-04 17:55:17 +0200 |
|---|---|---|
| committer | Joel Bodenmann <joel@unormal.org> | 2014-05-04 17:55:17 +0200 |
| commit | 7e791910246677f9e09c0957f1805409e790f57e (patch) | |
| tree | a3e31469a99323eb6e14f928c32fd070bffb1324 /src/gwin/gwidget.c | |
| parent | 1a0d1f1d1097ade825cdabbd693ebf7f48dcee77 (diff) | |
| parent | 9698f0a74319fa4a843783a1aa72dfca2c3fc90f (diff) | |
| download | uGFX-7e791910246677f9e09c0957f1805409e790f57e.tar.gz uGFX-7e791910246677f9e09c0957f1805409e790f57e.tar.bz2 uGFX-7e791910246677f9e09c0957f1805409e790f57e.zip | |
Merge branch 'master' into freertos
Diffstat (limited to 'src/gwin/gwidget.c')
| -rw-r--r-- | src/gwin/gwidget.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gwin/gwidget.c b/src/gwin/gwidget.c index ad2b7b20..181b7425 100644 --- a/src/gwin/gwidget.c +++ b/src/gwin/gwidget.c @@ -371,6 +371,9 @@ void gwinSetStyle(GHandle gh, const GWidgetStyle *pstyle) { } const GWidgetStyle *gwinGetStyle(GHandle gh) { + if (!(gh->flags & GWIN_FLG_WIDGET)) + return 0; + return gw->pstyle; } |