diff options
| author | Joel Bodenmann <joel@unormal.org> | 2014-05-09 12:20:32 +0200 |
|---|---|---|
| committer | Joel Bodenmann <joel@unormal.org> | 2014-05-09 12:20:32 +0200 |
| commit | ec09292542874ee8290f460413afef0adf789039 (patch) | |
| tree | 498d6286dd2656ad5e6ffe763305bf716bb643a8 /src/gwin | |
| parent | 82a3f8491f6ec3b6bbb161167fc435acbfacc3a1 (diff) | |
| download | uGFX-ec09292542874ee8290f460413afef0adf789039.tar.gz uGFX-ec09292542874ee8290f460413afef0adf789039.tar.bz2 uGFX-ec09292542874ee8290f460413afef0adf789039.zip | |
Revert "Renaming image widget files to appropriate name"
This reverts commit 82a3f8491f6ec3b6bbb161167fc435acbfacc3a1.
Diffstat (limited to 'src/gwin')
| -rw-r--r-- | src/gwin/gimage.c (renamed from src/gwin/imagebox.c) | 0 | ||||
| -rw-r--r-- | src/gwin/image.h (renamed from src/gwin/imagebox.h) | 0 | ||||
| -rw-r--r-- | src/gwin/sys_defs.h | 2 | ||||
| -rw-r--r-- | src/gwin/sys_make.mk | 2 |
4 files changed, 2 insertions, 2 deletions
diff --git a/src/gwin/imagebox.c b/src/gwin/gimage.c index 44ba785a..44ba785a 100644 --- a/src/gwin/imagebox.c +++ b/src/gwin/gimage.c diff --git a/src/gwin/imagebox.h b/src/gwin/image.h index fdaabc92..fdaabc92 100644 --- a/src/gwin/imagebox.h +++ b/src/gwin/image.h diff --git a/src/gwin/sys_defs.h b/src/gwin/sys_defs.h index 53ed016b..f4e1c2f7 100644 --- a/src/gwin/sys_defs.h +++ b/src/gwin/sys_defs.h @@ -874,7 +874,7 @@ extern "C" { #endif #if GWIN_NEED_IMAGE || defined(__DOXYGEN__) - #include "src/gwin/imagebox.h" + #include "src/gwin/image.h" #endif #endif /* GFX_USE_GWIN */ diff --git a/src/gwin/sys_make.mk b/src/gwin/sys_make.mk index 1e2404e6..4c670ea2 100644 --- a/src/gwin/sys_make.mk +++ b/src/gwin/sys_make.mk @@ -6,7 +6,7 @@ GFXSRC += $(GFXLIB)/src/gwin/gwin.c \ $(GFXLIB)/src/gwin/button.c \ $(GFXLIB)/src/gwin/slider.c \ $(GFXLIB)/src/gwin/checkbox.c \ - $(GFXLIB)/src/gwin/imagebox.c \ + $(GFXLIB)/src/gwin/gimage.c \ $(GFXLIB)/src/gwin/label.c \ $(GFXLIB)/src/gwin/radio.c \ $(GFXLIB)/src/gwin/list.c \ |